resolve merge conflict

Merge branch 'main' into stacked_axis

# Conflicts:
#	DESCRIPTION
#	NAMESPACE
#	_pkgdown.yml
#	man/ggplot2-ggproto.Rd
#	tests/testthat/test-guides.R

DESCRIPTION

@@ -175,7 +175,9 @@ Collate:
     'grouping.R'
     'guide-.R'
     'guide-axis.R'
+    'guide-axis-logticks.R'
     'guide-axis-stack.R'
+    'guide-axis-theta.R'
     'guide-legend.R'
     'guide-bins.R'
     'guide-colorbar.R'

NAMESPACE

@@ -212,6 +212,7 @@ export(GeomViolin)
 export(GeomVline)
 export(Guide)
 export(GuideAxis)
+export(GuideAxisLogticks)
 export(GuideAxisStack)
 export(GuideBins)
 export(GuideColourbar)
@@ -421,7 +422,9 @@ export(ggproto_parent)
 export(ggsave)
 export(ggtitle)
 export(guide_axis)
+export(guide_axis_logticks)
 export(guide_axis_stack)
+export(guide_axis_theta)
 export(guide_bins)
 export(guide_colorbar)
 export(guide_colorsteps)

_pkgdown.yml

@@ -126,7 +126,9 @@ reference:
   - guide_colourbar
   - guide_legend
   - guide_axis
+  - guide_axis_logticks
   - guide_axis_stack
+  - guide_axis_theta
   - guide_bins
   - guide_coloursteps
   - guide_none

tests/testthat/test-guides.R

@@ -624,6 +624,41 @@ test_that("guide_axis_stack stacks axes", {
   expect_doppelganger("stacked axes", p)
 })
 
+test_that("logticks look as they should", {
+
+  p <- ggplot(data.frame(x = c(-100, 100), y = c(10, 1000)), aes(x, y)) +
+    geom_point() +
+    scale_y_continuous(trans = compose_trans(log10_trans(), reverse_trans()),
+                       expand = expansion(add = 0.5)) +
+    scale_x_continuous(
+      breaks = c(-100, -10, -1, 0, 1, 10, 100)
+    ) +
+    coord_trans(x = pseudo_log_trans()) +
+    theme_test() +
+    theme(axis.line = element_line(colour = "black"),
+          panel.border = element_blank(),
+          axis.ticks.length.x.top = unit(-2.75, "pt")) +
+    guides(
+      x = guide_axis_logticks(
+        title = "Pseudo-logticks with 1 as smallest tick",
+        negative_small = 1
+      ),
+      y = guide_axis_logticks(
+        title = "Inverted logticks with swapped tick lengths",
+        long = 0.75, short = 2.25
+      ),
+      x.sec = guide_axis_logticks(
+        negative_small = 0.1,
+        title = "Negative length pseudo-logticks with 0.1 as smallest tick"
+      ),
+      y.sec = guide_axis_logticks(
+        expanded = FALSE, cap = "both",
+        title = "Capped and not-expanded inverted logticks"
+      )
+    )
+  expect_doppelganger("logtick axes with customisation", p)
+})
+
 test_that("guides are positioned correctly", {
   df <- data_frame(x = 1, y = 1, z = factor("a"))