Skip to content

Commit e3a4daf

Browse files
teunbrandteunbrand
authored
Rename ggpar() to gg_par() (#5899)
* rename `ggpar()` to `gparam()` * rename to `gg_par()`
1 parent 0d0dc62 commit e3a4daf

26 files changed

+64
-64
lines changed

‎NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ export(get_layer_grob)
429429
export(get_panel_scales)
430430
export(get_theme)
431431
export(gg_dep)
432-
export(ggpar)
432+
export(gg_par)
433433
export(ggplot)
434434
export(ggplotGrob)
435435
export(ggplot_add)

‎NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
(@teunbrand, #5756).
6262
* Fixed bug in `guide_custom()` that would throw error with `theme_void()`
6363
(@teunbrand, #5856).
64-
* New helper function `ggpar()` to translate ggplot2's interpretation of
64+
* New helper function `gg_par()` to translate ggplot2's interpretation of
6565
graphical parameters to {grid}'s interpretation (@teunbrand, #5866).
6666
* `scale_{x/y}_discrete()` can now accept a `sec.axis`. It is recommended to
6767
only use `dup_axis()` to set custom breaks or labels, as discrete variables

‎R/annotation-logticks.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,14 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
175175
ticks$x_b <- with(data, segmentsGrob(
176176
x0 = unit(xticks$x, "native"), x1 = unit(xticks$x, "native"),
177177
y0 = unit(xticks$start, "cm"), y1 = unit(xticks$end, "cm"),
178-
gp = ggpar(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
178+
gp = gg_par(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
179179
))
180180
}
181181
if (grepl("t", sides) && nrow(xticks) > 0) {
182182
ticks$x_t <- with(data, segmentsGrob(
183183
x0 = unit(xticks$x, "native"), x1 = unit(xticks$x, "native"),
184184
y0 = unit(1, "npc") - unit(xticks$start, "cm"), y1 = unit(1, "npc") - unit(xticks$end, "cm"),
185-
gp = ggpar(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
185+
gp = gg_par(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
186186
))
187187
}
188188
}
@@ -213,14 +213,14 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
213213
ticks$y_l <- with(data, segmentsGrob(
214214
y0 = unit(yticks$y, "native"), y1 = unit(yticks$y, "native"),
215215
x0 = unit(yticks$start, "cm"), x1 = unit(yticks$end, "cm"),
216-
gp = ggpar(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
216+
gp = gg_par(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
217217
))
218218
}
219219
if (grepl("r", sides) && nrow(yticks) > 0) {
220220
ticks$y_r <- with(data, segmentsGrob(
221221
y0 = unit(yticks$y, "native"), y1 = unit(yticks$y, "native"),
222222
x0 = unit(1, "npc") - unit(yticks$start, "cm"), x1 = unit(1, "npc") - unit(yticks$end, "cm"),
223-
gp = ggpar(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
223+
gp = gg_par(col = alpha(colour, alpha), lty = linetype, lwd = linewidth)
224224
))
225225
}
226226
}

‎R/annotation-map.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ GeomAnnotationMap <- ggproto("GeomAnnotationMap", GeomMap,
9595

9696
polygonGrob(coords$x, coords$y, default.units = "native",
9797
id = grob_id,
98-
gp = ggpar(
98+
gp = gg_par(
9999
col = data$colour, fill = alpha(data$fill, data$alpha),
100100
lwd = data$linewidth)
101101
)

‎R/coord-radial.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ CoordRadial <- ggproto("CoordRadial", Coord,
326326
y = c(Inf, -Inf, -Inf, Inf)
327327
)
328328
background <- coord_munch(self, background, panel_params, is_closed = TRUE)
329-
bg_gp <- ggpar(
329+
bg_gp <- gg_par(
330330
lwd = bg_element$linewidth,
331331
col = bg_element$colour, fill = bg_element$fill,
332332
lty = bg_element$linetype

‎R/coord-sf.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
335335
if (inherits(el, "element_blank")) {
336336
grobs <- list(element_render(theme, "panel.background"))
337337
} else {
338-
line_gp <- ggpar(
338+
line_gp <- gg_par(
339339
col = el$colour,
340340
lwd = el$linewidth,
341341
lty = el$linetype

‎R/geom-curve.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ GeomCurve <- ggproto("GeomCurve", GeomSegment,
6262
default.units = "native",
6363
curvature = curvature, angle = angle, ncp = ncp,
6464
square = FALSE, squareShape = 1, inflect = FALSE, open = TRUE,
65-
gp = ggpar(
65+
gp = gg_par(
6666
col = alpha(trans$colour, trans$alpha),
6767
fill = alpha(arrow.fill, trans$alpha),
6868
lwd = trans$linewidth,

‎R/geom-dotplot.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ GeomDotplot <- ggproto("GeomDotplot", Geom,
293293
dotstackGrob(stackaxis = stackaxis, x = tdata$x, y = tdata$y, dotdia = dotdianpc,
294294
stackposition = tdata$stackpos, stackdir = stackdir, stackratio = stackratio,
295295
default.units = "npc",
296-
gp = ggpar(col = alpha(tdata$colour, tdata$alpha),
297-
fill = fill_alpha(tdata$fill, tdata$alpha),
298-
lwd = tdata$stroke / .pt, lty = tdata$linetype,
299-
lineend = lineend))
296+
gp = gg_par(col = alpha(tdata$colour, tdata$alpha),
297+
fill = fill_alpha(tdata$fill, tdata$alpha),
298+
lwd = tdata$stroke / .pt, lty = tdata$linetype,
299+
lineend = lineend))
300300
)
301301
},
302302

‎R/geom-hex.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ GeomHex <- ggproto("GeomHex", Geom,
8989

9090
ggname("geom_hex", polygonGrob(
9191
coords$x, coords$y,
92-
gp = ggpar(
92+
gp = gg_par(
9393
col = data$colour,
9494
fill = fill_alpha(data$fill, data$alpha),
9595
lwd = data$linewidth,

‎R/geom-label.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ GeomLabel <- ggproto("GeomLabel", Geom,
9090
padding = label.padding,
9191
r = label.r,
9292
angle = row$angle,
93-
text.gp = ggpar(
93+
text.gp = gg_par(
9494
col = row$colour,
9595
fontsize = row$size * size.unit,
9696
fontfamily = row$family,
9797
fontface = row$fontface,
9898
lineheight = row$lineheight
9999
),
100-
rect.gp = ggpar(
100+
rect.gp = gg_par(
101101
col = if (isTRUE(all.equal(label.size, 0))) NA else row$colour,
102102
fill = fill_alpha(row$fill, row$alpha),
103103
lwd = label.size
@@ -115,7 +115,7 @@ GeomLabel <- ggproto("GeomLabel", Geom,
115115
labelGrob <- function(label, x = unit(0.5, "npc"), y = unit(0.5, "npc"),
116116
just = "center", padding = unit(0.25, "lines"), r = unit(0.1, "snpc"),
117117
angle = NULL, default.units = "npc", name = NULL,
118-
text.gp = gpar(), rect.gp = ggpar(fill = "white"), vp = NULL) {
118+
text.gp = gpar(), rect.gp = gg_par(fill = "white"), vp = NULL) {
119119

120120
if (length(label) != 1) {
121121
cli::cli_abort("{.arg label} must be of length 1.")
@@ -130,7 +130,7 @@ labelGrob <- function(label, x = unit(0.5, "npc"), y = unit(0.5, "npc"),
130130
vp <- viewport(
131131
angle = angle, x = x, y = y,
132132
width = unit(0, "cm"), height = unit(0, "cm"),
133-
gp = ggpar(fontsize = text.gp$fontsize)
133+
gp = gg_par(fontsize = text.gp$fontsize)
134134
)
135135
x <- unit(rep(0.5, length(x)), "npc")
136136
y <- unit(rep(0.5, length(y)), "npc")

‎R/geom-map.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ GeomMap <- ggproto("GeomMap", GeomPolygon,
144144
data <- data[data_rows, , drop = FALSE]
145145

146146
polygonGrob(coords$x, coords$y, default.units = "native", id = grob_id,
147-
gp = ggpar(
147+
gp = gg_par(
148148
col = data$colour,
149149
fill = fill_alpha(data$fill, data$alpha),
150150
lwd = data$linewidth,

‎R/geom-path.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ GeomPath <- ggproto("GeomPath", Geom,
206206
segmentsGrob(
207207
munched$x[!end], munched$y[!end], munched$x[!start], munched$y[!start],
208208
default.units = "native", arrow = arrow,
209-
gp = ggpar(
209+
gp = gg_par(
210210
col = alpha(munched$colour, munched$alpha)[!end],
211211
fill = alpha(munched$fill, munched$alpha)[!end],
212212
lwd = munched$linewidth[!end],
@@ -221,7 +221,7 @@ GeomPath <- ggproto("GeomPath", Geom,
221221
polylineGrob(
222222
munched$x, munched$y, id = id,
223223
default.units = "native", arrow = arrow,
224-
gp = ggpar(
224+
gp = gg_par(
225225
col = alpha(munched$colour, munched$alpha)[start],
226226
fill = alpha(munched$fill, munched$alpha)[start],
227227
lwd = munched$linewidth[start],

‎R/geom-point.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ GeomPoint <- ggproto("GeomPoint", Geom,
149149
pointsGrob(
150150
coords$x, coords$y,
151151
pch = coords$shape,
152-
gp = ggpar(
152+
gp = gg_par(
153153
col = alpha(coords$colour, coords$alpha),
154154
fill = fill_alpha(coords$fill, coords$alpha),
155155
pointsize = coords$size,

‎R/geom-polygon.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ GeomPolygon <- ggproto("GeomPolygon", Geom,
130130
polygonGrob(
131131
munched$x, munched$y, default.units = "native",
132132
id = munched$group,
133-
gp = ggpar(
133+
gp = gg_par(
134134
col = first_rows$colour,
135135
fill = fill_alpha(first_rows$fill, first_rows$alpha),
136136
lwd = first_rows$linewidth,
@@ -161,7 +161,7 @@ GeomPolygon <- ggproto("GeomPolygon", Geom,
161161
munched$x, munched$y, default.units = "native",
162162
id = id, pathId = munched$group,
163163
rule = rule,
164-
gp = ggpar(
164+
gp = gg_par(
165165
col = first_rows$colour,
166166
fill = fill_alpha(first_rows$fill, first_rows$alpha),
167167
lwd = first_rows$linewidth,

‎R/geom-rect.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ GeomRect <- ggproto("GeomRect", Geom,
5757
height = coords$ymax - coords$ymin,
5858
default.units = "native",
5959
just = c("left", "top"),
60-
gp = ggpar(
60+
gp = gg_par(
6161
col = coords$colour,
6262
fill = fill_alpha(coords$fill, coords$alpha),
6363
lwd = coords$linewidth,

‎R/geom-ribbon.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ GeomRibbon <- ggproto("GeomRibbon", Geom,
215215
g_poly <- polygonGrob(
216216
munched_poly$x, munched_poly$y, id = munched_poly$id,
217217
default.units = "native",
218-
gp = ggpar(
218+
gp = gg_par(
219219
fill = fill_alpha(aes$fill, aes$alpha),
220220
col = if (is_full_outline) aes$colour else NA,
221221
lwd = if (is_full_outline) aes$linewidth else 0,
@@ -246,7 +246,7 @@ GeomRibbon <- ggproto("GeomRibbon", Geom,
246246
g_lines <- polylineGrob(
247247
munched_lines$x, munched_lines$y, id = munched_lines$id,
248248
default.units = "native",
249-
gp = ggpar(
249+
gp = gg_par(
250250
col = aes$colour,
251251
lwd = aes$linewidth,
252252
lty = aes$linetype,

‎R/geom-rug.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ GeomRug <- ggproto("GeomRug", Geom,
108108
list(min = -1 * length, max = unit(1, "npc") + length)
109109
}
110110

111-
gp <- ggpar(
111+
gp <- gg_par(
112112
col = alpha(data$colour, data$alpha),
113113
lty = data$linetype,
114114
lwd = data$linewidth,

‎R/geom-segment.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ GeomSegment <- ggproto("GeomSegment", Geom,
122122
arrow.fill <- arrow.fill %||% coord$colour
123123
return(segmentsGrob(coord$x, coord$y, coord$xend, coord$yend,
124124
default.units = "native",
125-
gp = ggpar(
125+
gp = gg_par(
126126
col = alpha(coord$colour, coord$alpha),
127127
fill = alpha(arrow.fill, coord$alpha),
128128
lwd = coord$linewidth,

‎R/geom-text.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ GeomText <- ggproto("GeomText", Geom,
239239
data$x, data$y, default.units = "native",
240240
hjust = data$hjust, vjust = data$vjust,
241241
rot = data$angle,
242-
gp = ggpar(
242+
gp = gg_par(
243243
col = alpha(data$colour, data$alpha),
244244
fontsize = data$size * size.unit,
245245
fontfamily = data$family,

‎R/guide-colorbar.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ GuideColourbar <- ggproto(
379379
vjust = 0, hjust = 0,
380380
width = width, height = height,
381381
default.units = "npc",
382-
gp = ggpar(col = NA, fill = decor$colour)
382+
gp = gg_par(col = NA, fill = decor$colour)
383383
)
384384
} else if (params$display == "gradient") {
385385
check_device("gradients", call = expr(guide_colourbar()))
@@ -394,7 +394,7 @@ GuideColourbar <- ggproto(
394394
vertical = list(x1 = unit(0.5, "npc"), x2 = unit(0.5, "npc"))
395395
)
396396
gradient <- inject(linearGradient(decor$colour, value, !!!position))
397-
grob <- rectGrob(gp = ggpar(fill = gradient, col = NA))
397+
grob <- rectGrob(gp = gg_par(fill = gradient, col = NA))
398398
}
399399

400400
frame <- element_grob(elements$frame, fill = NA)

‎R/guide-colorsteps.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ GuideColoursteps <- ggproto(
204204

205205
size <- abs(decor$max - decor$min)
206206
just <- as.numeric(decor$min > decor$max)
207-
gp <- ggpar(col = NA, fill = decor$colour)
207+
gp <- gg_par(col = NA, fill = decor$colour)
208208
if (params$direction == "vertical") {
209209
grob <- rectGrob(
210210
x = 0, y = decor$min,

0 commit comments

Comments
 (0)