resolve merge conflict

Merge branch 'main' into geom_xrange_arrow

# Conflicts:
#	R/geom-linerange.R
#	man/geom_linerange.Rd

Author: teunbrand

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ about: Submit a bug report to help us improve ggplot2
 
 ### Tips for a helpful bug report:
 
-* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://community.rstudio.com/>.
+* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://forum.posit.co/>.
 
 * Please include a **minimal reproducible example**, a reprex, to demonstrate the bug.
 If you've never heard of a reprex, please read ["Make a reprex"](https://www.tidyverse.org/help/#reprex).

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
 contact_links:
   - name: Help or discussion
-    url: https://community.rstudio.com/
-    about: "Check out options for getting help on the RStudio Community."
+    url: https://forum.posit.co/
+    about: "Check out options for getting help on the Posit Community (formerly RStudio Community)."

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,7 +5,7 @@ about: Suggest a change or new feature in ggplot2
 
 ### Tips for a helpful feature request:
 
-* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://community.rstudio.com/>.
+* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://forum.posit.co/>.
 
 * See the [contributing guidelines](https://github.com/tidyverse/ggplot2/blob/main/CONTRIBUTING.md).
 

.github/workflows/R-CMD-check.yaml

@@ -58,7 +58,22 @@ jobs:
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
+      # TODO: remove this when R 4.6 is released
+      - name: Tweak for old Windows (R 4.1)
+        uses: r-lib/actions/setup-r-dependencies@v2
+        if: ${{ matrix.config.os == 'windows-latest' && matrix.config.r == 'oldrel-4' }}
+        with:
+          cache-version: 3
+          extra-packages: >
+            any::rcmdcheck,
+            [email protected],
+            Hmisc=?ignore-before-r=4.2.0,
+            quantreg=?ignore-before-r=4.3.0
+            local::.
+          needs: check
+
       - uses: r-lib/actions/setup-r-dependencies@v2
+        if: ${{ matrix.config.os != 'windows-latest' || matrix.config.r != 'oldrel-4' }}
         with:
           cache-version: 3
           extra-packages: >

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ggplot2
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
-Version: 3.5.2.9000
+Version: 4.0.1.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0003-4757-117X")),
@@ -40,6 +40,7 @@ Imports:
     isoband,
     lifecycle (> 1.0.1),
     rlang (>= 1.1.0),
+    S7,
     scales (>= 1.4.0),
     stats,
     vctrs (>= 0.6.0),
@@ -51,6 +52,7 @@ Suggests:
     ggplot2movies,
     hexbin,
     Hmisc,
+    hms,
     knitr,
     mapproj,
     maps,
@@ -61,40 +63,38 @@ Suggests:
     nlme,
     profvis,
     quantreg,
+    quarto,
     ragg (>= 1.2.6),
     RColorBrewer,
-    rmarkdown,
     roxygen2,
     rpart,
     sf (>= 0.7-3),
     svglite (>= 2.1.2),
-    testthat (>= 3.1.5),
+    testthat (>= 3.3.0),
     tibble,
     vdiffr (>= 1.0.6),
     xml2
 Enhances:
     sp
-VignetteBuilder:
-    knitr
+VignetteBuilder: 
+    quarto
 Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
 Config/testthat/edition: 3
 Config/usethis/last-upkeep: 2025-04-23
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 Collate:
-    'ggproto.R'
+    'aes-delayed-eval.R'
+    'aes-variants.R'
     'ggplot-global.R'
-    'aaa-.R'
-    'aes-colour-fill-alpha.R'
-    'aes-evaluation.R'
-    'aes-group-order.R'
-    'aes-linetype-size-shape.R'
-    'aes-position.R'
+    'ggproto.R'
+    'all-classes.R'
     'compat-plyr.R'
     'utilities.R'
     'aes.R'
+    'annotate.R'
     'annotation-borders.R'
     'utilities-checks.R'
     'legend-draw.R'
@@ -109,7 +109,6 @@ Collate:
     'annotation-map.R'
     'geom-raster.R'
     'annotation-raster.R'
-    'annotation.R'
     'autolayer.R'
     'autoplot.R'
     'axis-secondary.R'
@@ -128,32 +127,32 @@ Collate:
     'coord-sf.R'
     'coord-transform.R'
     'data.R'
-    'docs_layer.R'
+    'docs-aes.R'
+    'docs-layer.R'
     'facet-.R'
     'facet-grid-.R'
+    'facet-labeller.R'
     'facet-null.R'
     'facet-wrap.R'
     'fortify-map.R'
     'fortify-models.R'
     'fortify-spatial.R'
     'fortify.R'
     'stat-.R'
-    'geom-abline.R'
+    'geom-abline-hline-vline.R'
     'geom-rect.R'
     'geom-bar.R'
     'geom-tile.R'
     'geom-bin2d.R'
     'geom-blank.R'
     'geom-boxplot.R'
-    'geom-col.R'
     'geom-path.R'
     'geom-contour.R'
     'geom-point.R'
     'geom-count.R'
     'geom-crossbar.R'
     'geom-segment.R'
     'geom-curve.R'
-    'geom-defaults.R'
     'geom-ribbon.R'
     'geom-density.R'
     'geom-density2d.R'
@@ -163,7 +162,6 @@ Collate:
     'geom-function.R'
     'geom-hex.R'
     'geom-histogram.R'
-    'geom-hline.R'
     'geom-jitter.R'
     'geom-label.R'
     'geom-linerange.R'
@@ -174,13 +172,15 @@ Collate:
     'geom-smooth.R'
     'geom-spoke.R'
     'geom-text.R'
+    'geom-update-defaults.R'
     'geom-violin.R'
-    'geom-vline.R'
     'ggplot2-package.R'
     'grob-absolute.R'
     'grob-dotstack.R'
     'grob-null.R'
     'grouping.R'
+    'properties.R'
+    'margins.R'
     'theme-elements.R'
     'guide-.R'
     'guide-axis.R'
@@ -199,16 +199,14 @@ Collate:
     'hexbin.R'
     'import-standalone-obj-type.R'
     'import-standalone-types-check.R'
-    'labeller.R'
     'labels.R'
     'layer-sf.R'
     'layout.R'
     'limits.R'
-    'margins.R'
-    'performance.R'
     'plot-build.R'
     'plot-construction.R'
     'plot-last.R'
+    'plot-render.R'
     'plot.R'
     'position-.R'
     'position-collide.R'
@@ -284,6 +282,7 @@ Collate:
     'utilities-grid.R'
     'utilities-help.R'
     'utilities-patterns.R'
+    'utilities-performance.R'
     'utilities-resolution.R'
     'utilities-tidy-eval.R'
     'zxx.R'

NAMESPACE

@@ -2,30 +2,25 @@
 
 S3method("$",ggproto)
 S3method("$",ggproto_parent)
-S3method("$",theme)
-S3method("$<-",uneval)
-S3method("+",gg)
+S3method("$<-","ggplot2::element")
+S3method("$<-","ggplot2::gg")
+S3method("$<-","ggplot2::mapping")
 S3method("[",mapped_discrete)
-S3method("[",uneval)
+S3method("[<-","ggplot2::element")
+S3method("[<-","ggplot2::gg")
+S3method("[<-","ggplot2::mapping")
 S3method("[<-",mapped_discrete)
-S3method("[<-",uneval)
 S3method("[[",ggproto)
-S3method("[[<-",uneval)
+S3method("[[<-","ggplot2::element")
+S3method("[[<-","ggplot2::gg")
+S3method("[[<-","ggplot2::mapping")
 S3method(.DollarNames,ggproto)
 S3method(as.data.frame,mapped_discrete)
-S3method(as.gtable,ggplot)
-S3method(as.gtable,ggplot_built)
 S3method(as.list,ggproto)
 S3method(autolayer,default)
 S3method(autoplot,default)
 S3method(c,mapped_discrete)
 S3method(drawDetails,zeroGrob)
-S3method(element_grob,element_blank)
-S3method(element_grob,element_line)
-S3method(element_grob,element_point)
-S3method(element_grob,element_polygon)
-S3method(element_grob,element_rect)
-S3method(element_grob,element_text)
 S3method(format,ggproto)
 S3method(format,ggproto_method)
 S3method(format,rd_section_aesthetics)
@@ -52,30 +47,10 @@ S3method(fortify,sfg)
 S3method(fortify,summary.glht)
 S3method(fortify,tbl)
 S3method(fortify,tbl_df)
-S3method(get_alt_text,ggplot)
-S3method(get_alt_text,ggplot_built)
-S3method(get_alt_text,gtable)
 S3method(ggplot,"function")
 S3method(ggplot,default)
-S3method(ggplot_add,"NULL")
-S3method(ggplot_add,"function")
-S3method(ggplot_add,Coord)
-S3method(ggplot_add,Facet)
-S3method(ggplot_add,Guides)
-S3method(ggplot_add,Layer)
-S3method(ggplot_add,Scale)
-S3method(ggplot_add,by)
-S3method(ggplot_add,data.frame)
 S3method(ggplot_add,default)
-S3method(ggplot_add,labels)
-S3method(ggplot_add,list)
-S3method(ggplot_add,theme)
-S3method(ggplot_add,uneval)
-S3method(ggplot_build,ggplot)
-S3method(ggplot_build,ggplot_built)
-S3method(ggplot_gtable,ggplot_built)
 S3method(grid.draw,absoluteGrob)
-S3method(grid.draw,ggplot)
 S3method(grobHeight,absoluteGrob)
 S3method(grobHeight,zeroGrob)
 S3method(grobWidth,absoluteGrob)
@@ -98,27 +73,18 @@ S3method(limits,numeric)
 S3method(makeContext,dotstackGrob)
 S3method(make_constructor,Geom)
 S3method(make_constructor,Stat)
-S3method(merge_element,default)
-S3method(merge_element,element)
-S3method(merge_element,element_blank)
-S3method(merge_element,margin)
 S3method(pattern_alpha,GridPattern)
 S3method(pattern_alpha,GridTilingPattern)
 S3method(pattern_alpha,default)
 S3method(pattern_alpha,list)
-S3method(plot,ggplot)
 S3method(predictdf,default)
 S3method(predictdf,glm)
 S3method(predictdf,locfit)
 S3method(predictdf,loess)
-S3method(print,element)
-S3method(print,ggplot)
 S3method(print,ggplot2_bins)
 S3method(print,ggproto)
 S3method(print,ggproto_method)
 S3method(print,rel)
-S3method(print,theme)
-S3method(print,uneval)
 S3method(scale_type,Date)
 S3method(scale_type,POSIXt)
 S3method(scale_type,character)
@@ -132,7 +98,6 @@ S3method(scale_type,logical)
 S3method(scale_type,numeric)
 S3method(scale_type,ordered)
 S3method(scale_type,sfc)
-S3method(summary,ggplot)
 S3method(vec_cast,character.mapped_discrete)
 S3method(vec_cast,double.mapped_discrete)
 S3method(vec_cast,factor.mapped_discrete)
@@ -288,6 +253,7 @@ export(StatSummaryBin)
 export(StatSummaryHex)
 export(StatUnique)
 export(StatYdensity)
+export(add_gg)
 export(aes)
 export(aes_)
 export(aes_all)
@@ -313,6 +279,26 @@ export(binned_scale)
 export(borders)
 export(calc_element)
 export(check_device)
+export(class_S3_gg)
+export(class_coord)
+export(class_derive)
+export(class_facet)
+export(class_gg)
+export(class_ggplot)
+export(class_ggplot_built)
+export(class_ggproto)
+export(class_guide)
+export(class_guides)
+export(class_labels)
+export(class_layer)
+export(class_layout)
+export(class_mapping)
+export(class_rel)
+export(class_scale)
+export(class_scales_list)
+export(class_theme)
+export(class_waiver)
+export(class_zero_grob)
 export(combine_vars)
 export(complete_theme)
 export(continuous_scale)
@@ -353,6 +339,7 @@ export(draw_key_vline)
 export(draw_key_vpath)
 export(dup_axis)
 export(el_def)
+export(element)
 export(element_blank)
 export(element_geom)
 export(element_grob)
@@ -762,6 +749,7 @@ export(transform_position)
 export(translate_shape_string)
 export(unit)
 export(update_geom_defaults)
+export(update_ggplot)
 export(update_labels)
 export(update_stat_defaults)
 export(update_theme)
@@ -773,11 +761,13 @@ export(xlim)
 export(ylab)
 export(ylim)
 export(zeroGrob)
+if (getRversion() < "4.3.0") importFrom("S7", "@")
 import(grid)
 import(gtable)
 import(rlang)
 import(scales)
 import(vctrs)
+importFrom(S7,convert)
 importFrom(grid,arrow)
 importFrom(grid,unit)
 importFrom(lifecycle,deprecated)