Squashed commit of the following:

commit b049018
Merge: e1846bc ccf0ee5
Author: Thomas Knecht <[email protected]>
Date:   Mon Oct 7 12:29:23 2019 +0200

    Resolve conflict

    Merge branch 'Add_position_nudgestack' of https://github.com/ThomasKnecht/ggplot2 into Add_position_nudgestack

    # Conflicts:
    #	R/position-nudgestack.R

commit e1846bc
Author: Thomas Knecht <[email protected]>
Date:   Mon Oct 7 11:58:47 2019 +0200

    Add package spezifications

commit 5de0449
Author: Thomas Knecht <[email protected]>
Date:   Mon Oct 7 11:53:06 2019 +0200

    Add package spezifications

commit d9ec752
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:20:41 2019 +0200

    Style file

commit e0368b0
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 08:51:55 2019 +0200

    Resolve conflict

commit 325456a
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit 3210061
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 15:39:56 2019 +0200

    Add the zoo-package to Suggestions

commit 739ac7c
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 15:55:02 2019 +0200

    Add tests for correct nudging and stacking

commit 662a5da
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:12 2019 +0200

    Add validated svg for position_nudgestack

commit 598b786
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:29 2019 +0200

    Add test file with a doppelganger-test

commit 90d1257
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:47:58 2019 +0200

    Add time series example

commit 415811c
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:44:37 2019 +0200

    Add news

commit 6e4398c
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:20:41 2019 +0200

    Style file

commit b61211d
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:20:41 2019 +0200

    Style file

commit 369a34b
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 30 14:06:24 2019 +0200

    Use tsbox for converting ts object to tibble

commit e4e7ee0
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 08:51:55 2019 +0200

    Resolve conflict

commit 4d66dad
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 15:55:02 2019 +0200

    Add tests for correct nudging and stacking

commit 1b61750
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:29 2019 +0200

    Add test file with a doppelganger-test

commit 65e72fb
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit e5d61b5
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:06:00 2019 +0200

    Adjust filter criterion in examples

commit 8848fd9
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 30 14:06:24 2019 +0200

    Use tsbox for converting ts object to tibble

commit 28640d5
Author: Thomas Knecht <[email protected]>
Date:   Fri Sep 27 15:58:51 2019 +0200

    Bugfix

commit 59bc2a0
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:00:28 2019 +0200

    Add position-nudgestack.R into man

commit 71d567b
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:47:58 2019 +0200

    Add time series example

commit 3a1c71f
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 15:55:02 2019 +0200

    Add tests for correct nudging and stacking

commit f26bb90
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:12 2019 +0200

    Add validated svg for position_nudgestack

commit 3ba06ab
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:29 2019 +0200

    Add test file with a doppelganger-test

commit fbf28dc
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit 5270a9d
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:20 2019 +0200

    Delete packages from @examples

commit 32d2203
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:06:00 2019 +0200

    Adjust filter criterion in examples

commit fc6ba5a
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 15:39:56 2019 +0200

    Add the zoo-package to Suggestions

commit b1bb9d1
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:00:28 2019 +0200

    Add position-nudgestack.R into man

commit d1c7ad8
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:58:38 2019 +0200

    Add new position_nudgestack into NAMESPACE

commit 621730d
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:56:35 2019 +0200

    Add new position to DESCRIPTION

commit 0750e55
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:47:58 2019 +0200

    Add time series example

commit ce942ac
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:26:32 2019 +0200

    Delete emtpy rows

commit 86dfea0
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:09:06 2019 +0200

    Add position_nudgestack

commit ccf0ee5
Author: Thomas Knecht <[email protected]>
Date:   Mon Oct 7 11:58:47 2019 +0200

    Add package spezifications

commit 831d569
Author: Thomas Knecht <[email protected]>
Date:   Mon Oct 7 11:53:06 2019 +0200

    Add package spezifications

commit af4abb5
Merge: 0a89016 0ff81cb
Author: Thomas Knecht <[email protected]>
Date:   Wed Oct 2 16:37:11 2019 +0200

    Resolve conflict

    Merge branch 'Add_position_nudgestack' of https://github.com/ThomasKnecht/ggplot2 into Add_position_nudgestack

    # Conflicts:
    #	R/position-nudgestack.R

commit 0a89016
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:44:37 2019 +0200

    Add news

commit 083454a
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:20:41 2019 +0200

    Style file

commit 9cdcf6a
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:20:41 2019 +0200

    Style file

commit 7d23e89
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 08:51:55 2019 +0200

    Resolve conflict

commit 99eab52
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit 5fa6969
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 15:39:56 2019 +0200

    Add the zoo-package to Suggestions

commit 8642839
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 30 14:06:24 2019 +0200

    Use tsbox for converting ts object to tibble

commit f891dbc
Author: Thomas Knecht <[email protected]>
Date:   Fri Sep 27 15:58:51 2019 +0200

    Bugfix

commit a960ca8
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 15:55:02 2019 +0200

    Add tests for correct nudging and stacking

commit 5b89b32
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:12 2019 +0200

    Add validated svg for position_nudgestack

commit 37f1bd6
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:29 2019 +0200

    Add test file with a doppelganger-test

commit e392ac8
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit d443b80
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:20 2019 +0200

    Delete packages from @examples

commit d967b8e
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:06:00 2019 +0200

    Adjust filter criterion in examples

commit b1c8b1a
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 15:39:56 2019 +0200

    Add the zoo-package to Suggestions

commit 55602af
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:00:28 2019 +0200

    Add position-nudgestack.R into man

commit 9f6aa7d
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:58:38 2019 +0200

    Add new position_nudgestack into NAMESPACE

commit 1b7c4c0
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:56:35 2019 +0200

    Add new position to DESCRIPTION

commit 6d76c3a
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:47:58 2019 +0200

    Add time series example

commit f67ae70
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:26:32 2019 +0200

    Delete emtpy rows

commit 14fd33d
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:09:06 2019 +0200

    Add position_nudgestack

commit 0ff81cb
Merge: 7214587 10fa001
Author: Thomas Knecht <[email protected]>
Date:   Wed Oct 2 13:46:28 2019 +0200

    Merge remote-tracking branch 'upstream/master' into Add_position_nudgestack

commit 10fa001
Author: Thomas Lin Pedersen <[email protected]>
Date:   Tue Oct 1 11:12:59 2019 +0200

    Removing direction constraint from geoms (tidyverse#3506)

commit 88c5bde
Author: Mine Cetinkaya-Rundel <[email protected]>
Date:   Tue Oct 1 09:32:08 2019 +0100

    Minor updates to data docs (tidyverse#3545)

commit 7214587
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:44:37 2019 +0200

    Add news

commit 28ba9bf
Merge: daeb34e e688944
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:32:12 2019 +0200

    Merge branch 'Add_position_nudgestack' of https://github.com/ThomasKnecht/ggplot2 into Add_position_nudgestack

commit daeb34e
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:20:41 2019 +0200

    Style file

commit e688944
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:20:41 2019 +0200

    Style file

commit 9a45cc8
Author: Thomas Lin Pedersen <[email protected]>
Date:   Tue Oct 1 09:03:07 2019 +0200

    scale_binned (tidyverse#3096)

commit 02a038e
Merge: 88f4a63 bde6844
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 09:01:10 2019 +0200

    Resolve conflict

    Merge branch 'Add_position_nudgestack' of https://github.com/ThomasKnecht/ggplot2 into Add_position_nudgestack

    # Conflicts:
    #	R/position-nudgestack.R

commit 88f4a63
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 30 14:06:24 2019 +0200

    Use tsbox for converting ts object to tibble

commit 752e476
Author: Thomas Knecht <[email protected]>
Date:   Fri Sep 27 15:58:51 2019 +0200

    Bugfix

commit 5271987
Author: Thomas Knecht <[email protected]>
Date:   Tue Oct 1 08:51:55 2019 +0200

    Resolve conflict

commit 771918d
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 15:55:02 2019 +0200

    Add tests for correct nudging and stacking

commit da1e7be
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:37 2019 +0200

    Delete packages from example

commit a1573b3
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:12 2019 +0200

    Add validated svg for position_nudgestack

commit 59d2b6e
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:50 2019 +0200

    Update vdiffr version

commit 0e80c8a
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:29 2019 +0200

    Add test file with a doppelganger-test

commit 31cc104
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit dc6b78d
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:20 2019 +0200

    Delete packages from @examples

commit d35ea70
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:06:00 2019 +0200

    Adjust filter criterion in examples

commit 87c00fa
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 15:39:56 2019 +0200

    Add the zoo-package to Suggestions

commit f587fb8
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:01:48 2019 +0200

    Add description of position_nudgestack

commit 327a6cd
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:01:13 2019 +0200

    Add position_nudgestack into description

commit c97d54d
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:00:28 2019 +0200

    Add position-nudgestack.R into man

commit 7fbc0f7
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:58:38 2019 +0200

    Add new position_nudgestack into NAMESPACE

commit 9d894a8
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:56:35 2019 +0200

    Add new position to DESCRIPTION

commit 56e9b3b
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:47:58 2019 +0200

    Add time series example

commit 4535be6
Author: Mara Alexeev <[email protected]>
Date:   Tue Sep 3 08:26:07 2019 -0400

    Clarify documentation in mpg: very minor (tidyverse#3515)

    * add helpful explanation of mpg$drv

commit c8fa99f
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:26:32 2019 +0200

    Delete emtpy rows

commit a290bb3
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:09:06 2019 +0200

    Add position_nudgestack

commit bde6844
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 30 14:06:24 2019 +0200

    Use tsbox for converting ts object to tibble

commit 0ee259c
Author: bernie gray <[email protected]>
Date:   Mon Sep 30 06:54:57 2019 -0400

    default formula argument to NULL in geom_smooth() (tidyverse#3307)

commit fa000f7
Author: Dewey Dunnington <[email protected]>
Date:   Sun Sep 29 18:26:36 2019 -0300

    Make position guides customizable (tidyverse#3398, closes tidyverse#3322)

    * Position guides can now be customized using the new `guide_axis()`, which can be passed to position `scale_*()` functions or via `guides()`. The new axis guide (`guide_axis()`) comes with arguments `check.overlap` (automatic removal of overlapping labels), `angle` (easy rotation of axis labels), and `n.dodge` (dodge labels into multiple rows/columns)

    * `CoordCartesian` gets new methods to resolve/train the new position guides

commit 696fe9d
Author: Thomas Knecht <[email protected]>
Date:   Fri Sep 27 15:58:51 2019 +0200

    Bugfix

commit b027238
Merge: 10b5e24 c32f856
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 16:38:27 2019 +0200

    Merge branch 'Add_position_nudgestack' of https://github.com/TeddyLeeJones/ggplot2 into Add_position_nudgestack

commit 10b5e24
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 15:55:02 2019 +0200

    Add tests for correct nudging and stacking

commit 4fb6996
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:37 2019 +0200

    Delete packages from example

commit 823c686
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:12 2019 +0200

    Add validated svg for position_nudgestack

commit e6df407
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:50 2019 +0200

    Update vdiffr version

commit be91893
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:29 2019 +0200

    Add test file with a doppelganger-test

commit f44e504
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit 3713420
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:20 2019 +0200

    Delete packages from @examples

commit 9291957
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:06:00 2019 +0200

    Adjust filter criterion in examples

commit ef5aef7
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 15:39:56 2019 +0200

    Add the zoo-package to Suggestions

commit 42c0fa3
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:01:48 2019 +0200

    Add description of position_nudgestack

commit 548f313
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:01:13 2019 +0200

    Add position_nudgestack into description

commit 7bb930c
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:00:28 2019 +0200

    Add position-nudgestack.R into man

commit 9bd40d6
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:58:38 2019 +0200

    Add new position_nudgestack into NAMESPACE

commit c5022d3
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:56:35 2019 +0200

    Add new position to DESCRIPTION

commit 8572437
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:47:58 2019 +0200

    Add time series example

commit 3d61c3a
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:26:32 2019 +0200

    Delete emtpy rows

commit 2782c9d
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:09:06 2019 +0200

    Add position_nudgestack

commit c32f856
Author: Thomas Knecht <[email protected]>
Date:   Wed Sep 18 15:55:02 2019 +0200

    Add tests for correct nudging and stacking

commit d5c58da
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:37 2019 +0200

    Delete packages from example

commit 015b2e3
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:03:12 2019 +0200

    Add validated svg for position_nudgestack

commit 2484f71
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:50 2019 +0200

    Update vdiffr version

commit e2c1fb6
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 18:02:29 2019 +0200

    Add test file with a doppelganger-test

commit a681f59
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:49 2019 +0200

    Add new examples

commit 02f6be4
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:09:20 2019 +0200

    Delete packages from @examples

commit def4755
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 16:06:00 2019 +0200

    Adjust filter criterion in examples

commit c1729d1
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 17 15:39:56 2019 +0200

    Add the zoo-package to Suggestions

commit 5ebe5d4
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:01:48 2019 +0200

    Add description of position_nudgestack

commit 99b4b5e
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:01:13 2019 +0200

    Add position_nudgestack into description

commit 971b110
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 14:00:28 2019 +0200

    Add position-nudgestack.R into man

commit e5e91ea
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:58:38 2019 +0200

    Add new position_nudgestack into NAMESPACE

commit fedef93
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:56:35 2019 +0200

    Add new position to DESCRIPTION

commit bcc75a3
Author: Thomas Knecht <[email protected]>
Date:   Mon Sep 16 13:47:58 2019 +0200

    Add time series example

commit 23e3241
Author: Mara Alexeev <[email protected]>
Date:   Tue Sep 3 08:26:07 2019 -0400

    Clarify documentation in mpg: very minor (tidyverse#3515)

    * add helpful explanation of mpg$drv

commit 01d7db0
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:26:32 2019 +0200

    Delete emtpy rows

commit a486906
Author: Thomas Knecht <[email protected]>
Date:   Tue Sep 3 09:09:06 2019 +0200

    Add position_nudgestack

Author: ThomasKnecht

DESCRIPTION

@@ -55,7 +55,8 @@ Suggests:
     sf (>= 0.7-3),
     svglite (>= 1.2.0.9001),
     testthat (>= 2.1.0),
-    vdiffr (>= 0.3.0)
+    vdiffr (>= 0.3.0),
+    tsbox
 Enhances: sp
 License: GPL-2 | file LICENSE
 URL: http://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
@@ -153,11 +154,14 @@ Collate:
     'grob-dotstack.r'
     'grob-null.r'
     'grouping.r'
+    'guide-bins.R'
     'guide-colorbar.r'
+    'guide-colorsteps.R'
     'guide-legend.r'
     'guides-.r'
     'guides-axis.r'
     'guides-grid.r'
+    'guides-none.r'
     'hexbin.R'
     'labeller.r'
     'labels.r'
@@ -179,12 +183,14 @@ Collate:
     'position-jitter.r'
     'position-jitterdodge.R'
     'position-nudge.R'
+    'position-nudgestack.R'
     'position-stack.r'
     'quick-plot.r'
     'range.r'
     'save.r'
     'scale-.r'
     'scale-alpha.r'
+    'scale-binned.R'
     'scale-brewer.r'
     'scale-colour.r'
     'scale-continuous.r'
@@ -199,6 +205,7 @@ Collate:
     'scale-manual.r'
     'scale-shape.r'
     'scale-size.r'
+    'scale-steps.R'
     'scale-type.R'
     'scale-view.r'
     'scale-viridis.r'

NAMESPACE

@@ -67,14 +67,30 @@ S3method(grobWidth,absoluteGrob)
 S3method(grobWidth,zeroGrob)
 S3method(grobX,absoluteGrob)
 S3method(grobY,absoluteGrob)
+S3method(guide_gengrob,axis)
+S3method(guide_gengrob,bins)
 S3method(guide_gengrob,colorbar)
+S3method(guide_gengrob,guide_none)
 S3method(guide_gengrob,legend)
+S3method(guide_geom,axis)
+S3method(guide_geom,bins)
 S3method(guide_geom,colorbar)
+S3method(guide_geom,guide_none)
 S3method(guide_geom,legend)
+S3method(guide_merge,axis)
+S3method(guide_merge,bins)
 S3method(guide_merge,colorbar)
+S3method(guide_merge,guide_none)
 S3method(guide_merge,legend)
+S3method(guide_train,axis)
+S3method(guide_train,bins)
 S3method(guide_train,colorbar)
+S3method(guide_train,colorsteps)
+S3method(guide_train,guide_none)
 S3method(guide_train,legend)
+S3method(guide_transform,axis)
+S3method(guide_transform,default)
+S3method(guide_transform,guide_none)
 S3method(heightDetails,titleGrob)
 S3method(heightDetails,zeroGrob)
 S3method(interleave,default)
@@ -188,8 +204,11 @@ export(PositionIdentity)
 export(PositionJitter)
 export(PositionJitterdodge)
 export(PositionNudge)
+export(PositionNudgeStack)
 export(PositionStack)
 export(Scale)
+export(ScaleBinned)
+export(ScaleBinnedPosition)
 export(ScaleContinuous)
 export(ScaleContinuousDate)
 export(ScaleContinuousDatetime)
@@ -298,6 +317,8 @@ export(facet_grid)
 export(facet_null)
 export(facet_wrap)
 export(find_panel)
+export(flip_data)
+export(flipped_names)
 export(fortify)
 export(geom_abline)
 export(geom_area)
@@ -358,14 +379,21 @@ export(ggproto)
 export(ggproto_parent)
 export(ggsave)
 export(ggtitle)
+export(guide_axis)
+export(guide_bins)
 export(guide_colorbar)
+export(guide_colorsteps)
 export(guide_colourbar)
+export(guide_coloursteps)
 export(guide_gengrob)
 export(guide_geom)
 export(guide_legend)
 export(guide_merge)
+export(guide_none)
 export(guide_train)
+export(guide_transform)
 export(guides)
+export(has_flipped_aes)
 export(is.Coord)
 export(is.facet)
 export(is.ggplot)
@@ -405,6 +433,7 @@ export(position_identity)
 export(position_jitter)
 export(position_jitterdodge)
 export(position_nudge)
+export(position_nudgestack)
 export(position_stack)
 export(qplot)
 export(quickplot)
@@ -424,12 +453,14 @@ export(scale_alpha_discrete)
 export(scale_alpha_identity)
 export(scale_alpha_manual)
 export(scale_alpha_ordinal)
+export(scale_color_binned)
 export(scale_color_brewer)
 export(scale_color_continuous)
 export(scale_color_date)
 export(scale_color_datetime)
 export(scale_color_discrete)
 export(scale_color_distiller)
+export(scale_color_fermenter)
 export(scale_color_gradient)
 export(scale_color_gradient2)
 export(scale_color_gradientn)
@@ -438,14 +469,19 @@ export(scale_color_hue)
 export(scale_color_identity)
 export(scale_color_manual)
 export(scale_color_ordinal)
+export(scale_color_steps)
+export(scale_color_steps2)
+export(scale_color_stepsn)
 export(scale_color_viridis_c)
 export(scale_color_viridis_d)
+export(scale_colour_binned)
 export(scale_colour_brewer)
 export(scale_colour_continuous)
 export(scale_colour_date)
 export(scale_colour_datetime)
 export(scale_colour_discrete)
 export(scale_colour_distiller)
+export(scale_colour_fermenter)
 export(scale_colour_gradient)
 export(scale_colour_gradient2)
 export(scale_colour_gradientn)
@@ -454,17 +490,23 @@ export(scale_colour_hue)
 export(scale_colour_identity)
 export(scale_colour_manual)
 export(scale_colour_ordinal)
+export(scale_colour_steps)
+export(scale_colour_steps2)
+export(scale_colour_stepsn)
+export(scale_colour_viridis_b)
 export(scale_colour_viridis_c)
 export(scale_colour_viridis_d)
 export(scale_continuous_identity)
 export(scale_discrete_identity)
 export(scale_discrete_manual)
+export(scale_fill_binned)
 export(scale_fill_brewer)
 export(scale_fill_continuous)
 export(scale_fill_date)
 export(scale_fill_datetime)
 export(scale_fill_discrete)
 export(scale_fill_distiller)
+export(scale_fill_fermenter)
 export(scale_fill_gradient)
 export(scale_fill_gradient2)
 export(scale_fill_gradientn)
@@ -473,22 +515,30 @@ export(scale_fill_hue)
 export(scale_fill_identity)
 export(scale_fill_manual)
 export(scale_fill_ordinal)
+export(scale_fill_steps)
+export(scale_fill_steps2)
+export(scale_fill_stepsn)
+export(scale_fill_viridis_b)
 export(scale_fill_viridis_c)
 export(scale_fill_viridis_d)
 export(scale_linetype)
+export(scale_linetype_binned)
 export(scale_linetype_continuous)
 export(scale_linetype_discrete)
 export(scale_linetype_identity)
 export(scale_linetype_manual)
 export(scale_radius)
 export(scale_shape)
+export(scale_shape_binned)
 export(scale_shape_continuous)
 export(scale_shape_discrete)
 export(scale_shape_identity)
 export(scale_shape_manual)
 export(scale_shape_ordinal)
 export(scale_size)
 export(scale_size_area)
+export(scale_size_binned)
+export(scale_size_binned_area)
 export(scale_size_continuous)
 export(scale_size_date)
 export(scale_size_datetime)
@@ -497,6 +547,7 @@ export(scale_size_identity)
 export(scale_size_manual)
 export(scale_size_ordinal)
 export(scale_type)
+export(scale_x_binned)
 export(scale_x_continuous)
 export(scale_x_date)
 export(scale_x_datetime)
@@ -505,6 +556,7 @@ export(scale_x_log10)
 export(scale_x_reverse)
 export(scale_x_sqrt)
 export(scale_x_time)
+export(scale_y_binned)
 export(scale_y_continuous)
 export(scale_y_date)
 export(scale_y_datetime)

NEWS.md

@@ -1,5 +1,18 @@
 # ggplot2 (development version)
 
+* Added `position_nudgestack()`, which allows to nudge stacked columns. (@ThomasKnecht )
+
+* A new scale type has been added, that allows binning of aesthetics at the 
+  scale level. It has versions for both position and non-position aesthetics and
+  comes with two new guides (`guide_bins` and `guide_coloursteps`) (@thomasp85, #3096)
+  
+* Position guides can now be customized using the new `guide_axis()`,
+  which can be passed to position `scale_*()` functions or via
+  `guides()`. The new axis guide (`guide_axis()`) comes with
+  arguments `check.overlap` (automatic removal of overlapping
+  labels), `angle` (easy rotation of axis labels), and
+  `n.dodge` (dodge labels into multiple rows/columns) (@paleolimbot, #3322).
+
 * `Geom` now gains a `setup_params()` method in line with the other ggproto
   classes (@thomasp85, #3509)
 

R/axis-secondary.R

@@ -20,6 +20,9 @@
 #'   - A character vector giving labels (must be same length as `breaks`)
 #'   - A function that takes the breaks as input and returns labels as output
 #'
+#' @param guide A position guide that will be used to render
+#'   the axis on the plot. Usually this is [guide_axis()].
+#'
 #' @details
 #' `sec_axis` is used to create the specifications for a secondary axis.
 #' Except for the `trans` argument any of the arguments can be set to
@@ -79,7 +82,8 @@
 #'   labels = scales::time_format("%b %d %I %p")))
 #'
 #' @export
-sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels = waiver()) {
+sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels = waiver(),
+                     guide = waiver()) {
   # sec_axis() historically accpeted two-sided formula, so be permissive.
   if (length(trans) > 2) trans <- trans[c(1,3)]
 
@@ -88,14 +92,15 @@ sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels =
     trans = trans,
     name = name,
     breaks = breaks,
-    labels = labels
+    labels = labels,
+    guide = guide
   )
 }
 #' @rdname sec_axis
 #'
 #' @export
-dup_axis <- function(trans = ~., name = derive(), breaks = derive(), labels = derive()) {
-  sec_axis(trans, name, breaks, labels)
+dup_axis <- function(trans = ~., name = derive(), breaks = derive(), labels = derive(), guide = derive()) {
+  sec_axis(trans, name, breaks, labels, guide)
 }
 
 is.sec_axis <- function(x) {
@@ -148,6 +153,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
     if (is.derived(self$breaks)) self$breaks <- scale$breaks
     if (is.waive(self$breaks)) self$breaks <- scale$trans$breaks
     if (is.derived(self$labels)) self$labels <- scale$labels
+    if (is.derived(self$guide)) self$guide <- scale$guide
   },
 
   transform_range = function(self, range) {

R/coord-.r

@@ -59,7 +59,7 @@ Coord <- ggproto("Coord",
 
   aspect = function(ranges) NULL,
 
-  labels = function(panel_params) panel_params,
+  labels = function(labels, panel_params) labels,
 
   render_fg = function(panel_params, theme) element_render(theme, "panel.border"),
 
@@ -91,6 +91,14 @@ Coord <- ggproto("Coord",
     list()
   },
 
+  setup_panel_guides = function(self, panel_params, guides, params = list()) {
+    panel_params
+  },
+
+  train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) {
+    panel_params
+  },
+
   transform = function(data, range) NULL,
 
   distance = function(x, y, panel_params) NULL,