Skip to content

Commit e3a4daf

Browse files
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")

0 commit comments

Comments
 (0)