Skip to content

Commit d107718

Browse files
jihojiho
committed
Change name from brewerc to distiller
1 parent 6df162e commit d107718

File tree

9 files changed

+55
-71
lines changed

9 files changed

+55
-71
lines changed

‎NAMESPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,9 @@ export(scale_alpha_identity)
299299
export(scale_alpha_manual)
300300
export(scale_area)
301301
export(scale_color_brewer)
302-
export(scale_color_brewerc)
303302
export(scale_color_continuous)
304303
export(scale_color_discrete)
304+
export(scale_color_distiller)
305305
export(scale_color_gradient)
306306
export(scale_color_gradient2)
307307
export(scale_color_gradientn)
@@ -310,9 +310,9 @@ export(scale_color_hue)
310310
export(scale_color_identity)
311311
export(scale_color_manual)
312312
export(scale_colour_brewer)
313-
export(scale_colour_brewerc)
314313
export(scale_colour_continuous)
315314
export(scale_colour_discrete)
315+
export(scale_colour_distiller)
316316
export(scale_colour_gradient)
317317
export(scale_colour_gradient2)
318318
export(scale_colour_gradientn)
@@ -321,9 +321,9 @@ export(scale_colour_hue)
321321
export(scale_colour_identity)
322322
export(scale_colour_manual)
323323
export(scale_fill_brewer)
324-
export(scale_fill_brewerc)
325324
export(scale_fill_continuous)
326325
export(scale_fill_discrete)
326+
export(scale_fill_distiller)
327327
export(scale_fill_gradient)
328328
export(scale_fill_gradient2)
329329
export(scale_fill_gradientn)

‎R/scale-brewer.r

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,25 @@ scale_fill_brewer <- function(..., type = "seq", palette = 1) {
5151

5252
#' @export
5353
#' @rdname scale_brewer
54-
scale_colour_brewerc <- function(..., type = "seq", palette = 1, values = NULL, space = "Lab", na.value = "grey50") {
54+
scale_colour_distiller <- function(..., type = "seq", palette = 1, values = NULL, space = "Lab", na.value = "grey50") {
5555
# warn about using a qualitative brewer palette to generate the gradient
5656
type <- match.arg(type, c("seq", "div", "qual"))
5757
if (type == "qual") {
5858
warning("Using a discrete colour palette in a continuous scale.\n Consider using type=\"seq\" or type=\"div\" instead")
5959
}
60-
continuous_scale("colour", "brewerc",
60+
continuous_scale("colour", "distiller",
6161
gradient_n_pal(brewer_pal(type, palette)(6), values, space), na.value = na.value, ...)
6262
# NB: 6 colours per palette gives nice gradients; more results in more saturated colours which do not look as good
6363
}
6464

6565
#' @export
6666
#' @rdname scale_brewer
67-
scale_fill_brewerc <- function(..., type = "seq", palette = 1, values = NULL, space = "Lab", na.value = "grey50") {
67+
scale_fill_distiller <- function(..., type = "seq", palette = 1, values = NULL, space = "Lab", na.value = "grey50") {
6868
type <- match.arg(type, c("seq", "div", "qual"))
6969
if (type == "qual") {
7070
warning("Using a discrete colour palette in a continuous scale.\n Consider using type=\"seq\" or type=\"div\" instead")
7171
}
72-
continuous_scale("fill", "brewerc",
72+
continuous_scale("fill", "distiller",
7373
gradient_n_pal(brewer_pal(type, palette)(6), values, space), na.value = na.value, ...)
7474
}
7575

‎R/zxx.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ scale_color_brewer <- scale_colour_brewer
2424

2525
#' @export
2626
#' @rdname scale_brewer
27-
scale_color_brewerc <- scale_colour_brewerc
27+
scale_color_distiller <- scale_colour_distiller
2828

2929
#' @export
3030
#' @rdname scale_gradient

‎man/scale_brewer.Rd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
% Generated by roxygen2 (4.0.0): do not edit by hand
22
\name{scale_colour_brewer}
33
\alias{scale_color_brewer}
4-
\alias{scale_color_brewerc}
4+
\alias{scale_color_distiller}
55
\alias{scale_colour_brewer}
6-
\alias{scale_colour_brewerc}
6+
\alias{scale_colour_distiller}
77
\alias{scale_fill_brewer}
8-
\alias{scale_fill_brewerc}
8+
\alias{scale_fill_distiller}
99
\title{Sequential, diverging and qualitative colour scales from colorbrewer.org}
1010
\usage{
1111
scale_colour_brewer(..., type = "seq", palette = 1)
1212

1313
scale_fill_brewer(..., type = "seq", palette = 1)
1414

15-
scale_colour_brewerc(..., type = "seq", palette = 1,
15+
scale_colour_distiller(..., type = "seq", palette = 1,
1616
values = NULL, space = "Lab", na.value = "grey50")
1717

18-
scale_fill_brewerc(..., type = "seq", palette = 1,
18+
scale_fill_distiller(..., type = "seq", palette = 1,
1919
values = NULL, space = "Lab", na.value = "grey50")
2020

2121
scale_color_brewer(..., type = "seq", palette = 1)
2222

23-
scale_color_brewerc(..., type = "seq", palette = 1,
23+
scale_color_distiller(..., type = "seq", palette = 1,
2424
values = NULL, space = "Lab", na.value = "grey50")
2525
}
2626
\arguments{

‎man/scale_gradient.Rd

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,16 @@ qplot(mpg, wt, data = mtcars, colour = miss) +
9898
\code{\link[scales]{seq_gradient_pal}} for details on underlying
9999
palette
100100

101-
Other colour scales: \code{\link{scale_color_brewer}},
102-
\code{\link{scale_color_brewerc}},
103-
\code{\link{scale_colour_brewer}},
104-
\code{\link{scale_colour_brewerc}},
101+
Other colour scales: \code{\link{scale_color_brewer}},
105102
\code{\link{scale_color_discrete}},
103+
\code{\link{scale_color_distiller}},
104+
\code{\link{scale_color_gradient2}},
105+
\code{\link{scale_color_gradientn}},
106+
\code{\link{scale_color_grey}},
106107
\code{\link{scale_color_hue}},
107108
\code{\link{scale_colour_brewer}},
108-
\code{\link{scale_colour_brewerc}},
109109
\code{\link{scale_colour_discrete}},
110-
\code{\link{scale_colour_hue}},
111-
\code{\link{scale_fill_discrete}},
112-
\code{\link{scale_fill_hue}};
113-
\code{\link{scale_color_gradient2}},
110+
\code{\link{scale_colour_distiller}},
114111
\code{\link{scale_colour_gradient2}},
115112
\code{\link{scale_fill_gradient2}};
116113
\code{\link{scale_color_gradientn}},
@@ -121,8 +118,8 @@ Other colour scales: \code{\link{scale_color_brewer}},
121118
\code{\link{scale_fill_grey}}
122119
\code{\link{scale_colour_hue}},
123120
\code{\link{scale_fill_brewer}},
124-
\code{\link{scale_fill_brewerc}},
125121
\code{\link{scale_fill_discrete}},
122+
\code{\link{scale_fill_distiller}},
126123
\code{\link{scale_fill_gradient2}},
127124
\code{\link{scale_fill_gradientn}},
128125
\code{\link{scale_fill_grey}},

‎man/scale_gradient2.Rd

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,37 +86,34 @@ p + scale_fill_gradient2("fill")
8686
}
8787
}
8888
\seealso{
89-
Other colour scales: \code{\link{scale_color_brewer}},
90-
\code{\link{scale_color_brewerc}},
91-
\code{\link{scale_colour_brewer}},
92-
\code{\link{scale_colour_brewerc}},
89+
Other colour scales: \code{\link{scale_color_brewer}},
9390
\code{\link{scale_color_continuous}},
91+
\code{\link{scale_color_discrete}},
92+
\code{\link{scale_color_distiller}},
9493
\code{\link{scale_color_gradient}},
9594
\code{\link{scale_color_gradientn}},
9695
\code{\link{scale_color_grey}},
9796
\code{\link{scale_color_hue}},
9897
\code{\link{scale_colour_brewer}},
99-
\code{\link{scale_colour_brewerc}},
10098
\code{\link{scale_colour_continuous}},
99+
\code{\link{scale_colour_discrete}},
100+
\code{\link{scale_colour_distiller}},
101101
\code{\link{scale_colour_gradient}},
102102
\code{\link{scale_colour_gradientn}},
103103
\code{\link{scale_colour_grey}},
104104
\code{\link{scale_colour_hue}},
105105
\code{\link{scale_fill_brewer}},
106-
\code{\link{scale_fill_brewerc}},
107106
\code{\link{scale_fill_continuous}},
108107
\code{\link{scale_fill_gradient}};
109108
\code{\link{scale_color_discrete}},
110109
\code{\link{scale_color_hue}},
111110
\code{\link{scale_colour_discrete}},
112111
\code{\link{scale_colour_hue}},
113112
\code{\link{scale_fill_discrete}},
114-
\code{\link{scale_fill_hue}};
115-
\code{\link{scale_color_gradientn}},
116-
\code{\link{scale_colour_gradientn}},
117-
\code{\link{scale_fill_gradientn}};
118-
\code{\link{scale_color_grey}},
119-
\code{\link{scale_colour_grey}},
120-
\code{\link{scale_fill_grey}}
113+
\code{\link{scale_fill_distiller}},
114+
\code{\link{scale_fill_gradient}},
115+
\code{\link{scale_fill_gradientn}},
116+
\code{\link{scale_fill_grey}},
117+
\code{\link{scale_fill_hue}}
121118
}
122119

‎man/scale_gradientn.Rd

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,37 +67,34 @@ d + scale_colour_gradientn(colours = terrain.colors(10),
6767
}
6868
}
6969
\seealso{
70-
Other colour scales: \code{\link{scale_color_brewer}},
71-
\code{\link{scale_color_brewerc}},
72-
\code{\link{scale_colour_brewer}},
73-
\code{\link{scale_colour_brewerc}},
70+
Other colour scales: \code{\link{scale_color_brewer}},
7471
\code{\link{scale_color_continuous}},
72+
\code{\link{scale_color_discrete}},
73+
\code{\link{scale_color_distiller}},
7574
\code{\link{scale_color_gradient}},
7675
\code{\link{scale_color_gradient2}},
7776
\code{\link{scale_color_grey}},
7877
\code{\link{scale_color_hue}},
7978
\code{\link{scale_colour_brewer}},
80-
\code{\link{scale_colour_brewerc}},
8179
\code{\link{scale_colour_continuous}},
80+
\code{\link{scale_colour_discrete}},
81+
\code{\link{scale_colour_distiller}},
8282
\code{\link{scale_colour_gradient}},
8383
\code{\link{scale_colour_gradient2}},
8484
\code{\link{scale_colour_grey}},
8585
\code{\link{scale_colour_hue}},
8686
\code{\link{scale_fill_brewer}},
87-
\code{\link{scale_fill_brewerc}},
8887
\code{\link{scale_fill_continuous}},
8988
\code{\link{scale_fill_gradient}};
9089
\code{\link{scale_color_discrete}},
9190
\code{\link{scale_color_hue}},
9291
\code{\link{scale_colour_discrete}},
9392
\code{\link{scale_colour_hue}},
9493
\code{\link{scale_fill_discrete}},
95-
\code{\link{scale_fill_hue}};
96-
\code{\link{scale_color_gradient2}},
97-
\code{\link{scale_colour_gradient2}},
98-
\code{\link{scale_fill_gradient2}};
99-
\code{\link{scale_color_grey}},
100-
\code{\link{scale_colour_grey}},
101-
\code{\link{scale_fill_grey}}
94+
\code{\link{scale_fill_distiller}},
95+
\code{\link{scale_fill_gradient}},
96+
\code{\link{scale_fill_gradient2}},
97+
\code{\link{scale_fill_grey}},
98+
\code{\link{scale_fill_hue}}
10299
}
103100

‎man/scale_grey.Rd

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,34 @@ qplot(mpg, wt, data = mtcars, colour = miss) +
4040
scale_colour_grey(na.value = "green")
4141
}
4242
\seealso{
43-
Other colour scales: \code{\link{scale_color_brewer}},
44-
\code{\link{scale_color_brewerc}},
45-
\code{\link{scale_colour_brewer}},
46-
\code{\link{scale_colour_brewerc}},
47-
\code{\link{scale_fill_brewer}};
43+
Other colour scales: \code{\link{scale_color_brewer}},
4844
\code{\link{scale_color_continuous}},
45+
\code{\link{scale_color_discrete}},
46+
\code{\link{scale_color_distiller}},
4947
\code{\link{scale_color_gradient}},
5048
\code{\link{scale_color_gradient2}},
5149
\code{\link{scale_color_gradientn}},
5250
\code{\link{scale_color_hue}},
5351
\code{\link{scale_colour_brewer}},
54-
\code{\link{scale_colour_brewerc}},
5552
\code{\link{scale_colour_continuous}},
53+
\code{\link{scale_colour_discrete}},
54+
\code{\link{scale_colour_distiller}},
5655
\code{\link{scale_colour_gradient}},
5756
\code{\link{scale_colour_gradient2}},
5857
\code{\link{scale_colour_gradientn}},
5958
\code{\link{scale_colour_hue}},
6059
\code{\link{scale_fill_brewer}},
61-
\code{\link{scale_fill_brewerc}},
6260
\code{\link{scale_fill_continuous}},
6361
\code{\link{scale_fill_gradient}};
6462
\code{\link{scale_color_discrete}},
6563
\code{\link{scale_color_hue}},
6664
\code{\link{scale_colour_discrete}},
6765
\code{\link{scale_colour_hue}},
6866
\code{\link{scale_fill_discrete}},
69-
\code{\link{scale_fill_hue}};
70-
\code{\link{scale_color_gradient2}},
71-
\code{\link{scale_colour_gradient2}},
72-
\code{\link{scale_fill_gradient2}};
73-
\code{\link{scale_color_gradientn}},
74-
\code{\link{scale_colour_gradientn}},
75-
\code{\link{scale_fill_gradientn}}
67+
\code{\link{scale_fill_distiller}},
68+
\code{\link{scale_fill_gradient}},
69+
\code{\link{scale_fill_gradient2}},
70+
\code{\link{scale_fill_gradientn}},
71+
\code{\link{scale_fill_hue}}
7672
}
7773

‎man/scale_hue.Rd

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,16 @@ qplot(mpg, wt, data = mtcars, colour = miss) +
8585
}
8686
}
8787
\seealso{
88-
<<<<<<< HEAD
89-
Other colour scales: \code{\link{scale_color_brewer}},
90-
\code{\link{scale_color_brewerc}},
91-
\code{\link{scale_colour_brewer}},
92-
\code{\link{scale_colour_brewerc}},
88+
Other colour scales: \code{\link{scale_color_brewer}},
9389
\code{\link{scale_color_continuous}},
90+
\code{\link{scale_color_distiller}},
9491
\code{\link{scale_color_gradient}},
9592
\code{\link{scale_color_gradient2}},
9693
\code{\link{scale_color_gradientn}},
9794
\code{\link{scale_color_grey}},
9895
\code{\link{scale_colour_brewer}},
99-
\code{\link{scale_colour_brewerc}},
10096
\code{\link{scale_colour_continuous}},
97+
\code{\link{scale_colour_distiller}},
10198
\code{\link{scale_colour_gradient}},
10299
\code{\link{scale_fill_continuous}},
103100
\code{\link{scale_fill_gradient}};
@@ -110,8 +107,8 @@ Other colour scales: \code{\link{scale_color_brewer}},
110107
\code{\link{scale_color_grey}},
111108
\code{\link{scale_colour_grey}},
112109
\code{\link{scale_fill_brewer}},
113-
\code{\link{scale_fill_brewerc}},
114110
\code{\link{scale_fill_continuous}},
111+
\code{\link{scale_fill_distiller}},
115112
\code{\link{scale_fill_gradient}},
116113
\code{\link{scale_fill_gradient2}},
117114
\code{\link{scale_fill_gradientn}},

0 commit comments

Comments
 (0)