Skip to content

Commit d5c4124

Browse files
ThomasKnechtThomasKnecht
committed
Squashed commit of the following:
commit b049018 Merge: e1846bc ccf0ee5 Author: Thomas Knecht <t.knecht@hotmail.com> 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 <t.knecht@hotmail.com> Date: Mon Oct 7 11:58:47 2019 +0200 Add package spezifications commit 5de0449 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Mon Oct 7 11:53:06 2019 +0200 Add package spezifications commit d9ec752 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:20:41 2019 +0200 Style file commit e0368b0 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 08:51:55 2019 +0200 Resolve conflict commit 325456a Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit 3210061 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 15:39:56 2019 +0200 Add the zoo-package to Suggestions commit 739ac7c Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Wed Sep 18 15:55:02 2019 +0200 Add tests for correct nudging and stacking commit 662a5da Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:12 2019 +0200 Add validated svg for position_nudgestack commit 598b786 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:29 2019 +0200 Add test file with a doppelganger-test commit 90d1257 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:47:58 2019 +0200 Add time series example commit 415811c Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:44:37 2019 +0200 Add news commit 6e4398c Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:20:41 2019 +0200 Style file commit b61211d Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:20:41 2019 +0200 Style file commit 369a34b Author: Thomas Knecht <t.knecht@hotmail.com> Date: Mon Sep 30 14:06:24 2019 +0200 Use tsbox for converting ts object to tibble commit e4e7ee0 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 08:51:55 2019 +0200 Resolve conflict commit 4d66dad Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Wed Sep 18 15:55:02 2019 +0200 Add tests for correct nudging and stacking commit 1b61750 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:29 2019 +0200 Add test file with a doppelganger-test commit 65e72fb Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit e5d61b5 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:06:00 2019 +0200 Adjust filter criterion in examples commit 8848fd9 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Mon Sep 30 14:06:24 2019 +0200 Use tsbox for converting ts object to tibble commit 28640d5 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Fri Sep 27 15:58:51 2019 +0200 Bugfix commit 59bc2a0 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:00:28 2019 +0200 Add position-nudgestack.R into man commit 71d567b Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:47:58 2019 +0200 Add time series example commit 3a1c71f Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Wed Sep 18 15:55:02 2019 +0200 Add tests for correct nudging and stacking commit f26bb90 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:12 2019 +0200 Add validated svg for position_nudgestack commit 3ba06ab Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:29 2019 +0200 Add test file with a doppelganger-test commit fbf28dc Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit 5270a9d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:20 2019 +0200 Delete packages from @examples commit 32d2203 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:06:00 2019 +0200 Adjust filter criterion in examples commit fc6ba5a Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 15:39:56 2019 +0200 Add the zoo-package to Suggestions commit b1bb9d1 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:00:28 2019 +0200 Add position-nudgestack.R into man commit d1c7ad8 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:58:38 2019 +0200 Add new position_nudgestack into NAMESPACE commit 621730d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:56:35 2019 +0200 Add new position to DESCRIPTION commit 0750e55 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:47:58 2019 +0200 Add time series example commit ce942ac Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:26:32 2019 +0200 Delete emtpy rows commit 86dfea0 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:09:06 2019 +0200 Add position_nudgestack commit ccf0ee5 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Mon Oct 7 11:58:47 2019 +0200 Add package spezifications commit 831d569 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Mon Oct 7 11:53:06 2019 +0200 Add package spezifications commit af4abb5 Merge: 0a89016 0ff81cb Author: Thomas Knecht <t.knecht@hotmail.com> 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 <t.knecht@hotmail.com> Date: Tue Oct 1 09:44:37 2019 +0200 Add news commit 083454a Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:20:41 2019 +0200 Style file commit 9cdcf6a Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:20:41 2019 +0200 Style file commit 7d23e89 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 08:51:55 2019 +0200 Resolve conflict commit 99eab52 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit 5fa6969 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 15:39:56 2019 +0200 Add the zoo-package to Suggestions commit 8642839 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Mon Sep 30 14:06:24 2019 +0200 Use tsbox for converting ts object to tibble commit f891dbc Author: Thomas Knecht <t.knecht@hotmail.com> Date: Fri Sep 27 15:58:51 2019 +0200 Bugfix commit a960ca8 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Wed Sep 18 15:55:02 2019 +0200 Add tests for correct nudging and stacking commit 5b89b32 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:12 2019 +0200 Add validated svg for position_nudgestack commit 37f1bd6 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:29 2019 +0200 Add test file with a doppelganger-test commit e392ac8 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit d443b80 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:20 2019 +0200 Delete packages from @examples commit d967b8e Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:06:00 2019 +0200 Adjust filter criterion in examples commit b1c8b1a Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 15:39:56 2019 +0200 Add the zoo-package to Suggestions commit 55602af Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:00:28 2019 +0200 Add position-nudgestack.R into man commit 9f6aa7d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:58:38 2019 +0200 Add new position_nudgestack into NAMESPACE commit 1b7c4c0 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:56:35 2019 +0200 Add new position to DESCRIPTION commit 6d76c3a Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:47:58 2019 +0200 Add time series example commit f67ae70 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:26:32 2019 +0200 Delete emtpy rows commit 14fd33d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:09:06 2019 +0200 Add position_nudgestack commit 0ff81cb Merge: 7214587 10fa001 Author: Thomas Knecht <t.knecht@hotmail.com> 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 <thomasp85@gmail.com> Date: Tue Oct 1 11:12:59 2019 +0200 Removing direction constraint from geoms (tidyverse#3506) commit 88c5bde Author: Mine Cetinkaya-Rundel <cetinkaya.mine@gmail.com> Date: Tue Oct 1 09:32:08 2019 +0100 Minor updates to data docs (tidyverse#3545) commit 7214587 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:44:37 2019 +0200 Add news commit 28ba9bf Merge: daeb34e e688944 Author: Thomas Knecht <t.knecht@hotmail.com> 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 <t.knecht@hotmail.com> Date: Tue Oct 1 09:20:41 2019 +0200 Style file commit e688944 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 09:20:41 2019 +0200 Style file commit 9a45cc8 Author: Thomas Lin Pedersen <thomasp85@gmail.com> Date: Tue Oct 1 09:03:07 2019 +0200 scale_binned (tidyverse#3096) commit 02a038e Merge: 88f4a63 bde6844 Author: Thomas Knecht <t.knecht@hotmail.com> 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 <t.knecht@hotmail.com> Date: Mon Sep 30 14:06:24 2019 +0200 Use tsbox for converting ts object to tibble commit 752e476 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Fri Sep 27 15:58:51 2019 +0200 Bugfix commit 5271987 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Tue Oct 1 08:51:55 2019 +0200 Resolve conflict commit 771918d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Wed Sep 18 15:55:02 2019 +0200 Add tests for correct nudging and stacking commit da1e7be Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:37 2019 +0200 Delete packages from example commit a1573b3 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:12 2019 +0200 Add validated svg for position_nudgestack commit 59d2b6e Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:50 2019 +0200 Update vdiffr version commit 0e80c8a Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:29 2019 +0200 Add test file with a doppelganger-test commit 31cc104 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit dc6b78d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:20 2019 +0200 Delete packages from @examples commit d35ea70 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:06:00 2019 +0200 Adjust filter criterion in examples commit 87c00fa Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 15:39:56 2019 +0200 Add the zoo-package to Suggestions commit f587fb8 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:01:48 2019 +0200 Add description of position_nudgestack commit 327a6cd Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:01:13 2019 +0200 Add position_nudgestack into description commit c97d54d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:00:28 2019 +0200 Add position-nudgestack.R into man commit 7fbc0f7 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:58:38 2019 +0200 Add new position_nudgestack into NAMESPACE commit 9d894a8 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:56:35 2019 +0200 Add new position to DESCRIPTION commit 56e9b3b Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:47:58 2019 +0200 Add time series example commit 4535be6 Author: Mara Alexeev <39673697+MaraAlexeev@users.noreply.github.com> 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 <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:26:32 2019 +0200 Delete emtpy rows commit a290bb3 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:09:06 2019 +0200 Add position_nudgestack commit bde6844 Author: Thomas Knecht <t.knecht@hotmail.com> Date: Mon Sep 30 14:06:24 2019 +0200 Use tsbox for converting ts object to tibble commit 0ee259c Author: bernie gray <bfgray3@users.noreply.github.com> Date: Mon Sep 30 06:54:57 2019 -0400 default formula argument to NULL in geom_smooth() (tidyverse#3307) commit fa000f7 Author: Dewey Dunnington <dewey@fishandwhistle.net> 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 <t.knecht@hotmail.com> Date: Fri Sep 27 15:58:51 2019 +0200 Bugfix commit b027238 Merge: 10b5e24 c32f856 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> 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 <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Wed Sep 18 15:55:02 2019 +0200 Add tests for correct nudging and stacking commit 4fb6996 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:37 2019 +0200 Delete packages from example commit 823c686 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:12 2019 +0200 Add validated svg for position_nudgestack commit e6df407 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:50 2019 +0200 Update vdiffr version commit be91893 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:29 2019 +0200 Add test file with a doppelganger-test commit f44e504 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit 3713420 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:20 2019 +0200 Delete packages from @examples commit 9291957 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:06:00 2019 +0200 Adjust filter criterion in examples commit ef5aef7 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 15:39:56 2019 +0200 Add the zoo-package to Suggestions commit 42c0fa3 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:01:48 2019 +0200 Add description of position_nudgestack commit 548f313 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:01:13 2019 +0200 Add position_nudgestack into description commit 7bb930c Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:00:28 2019 +0200 Add position-nudgestack.R into man commit 9bd40d6 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:58:38 2019 +0200 Add new position_nudgestack into NAMESPACE commit c5022d3 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:56:35 2019 +0200 Add new position to DESCRIPTION commit 8572437 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:47:58 2019 +0200 Add time series example commit 3d61c3a Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:26:32 2019 +0200 Delete emtpy rows commit 2782c9d Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:09:06 2019 +0200 Add position_nudgestack commit c32f856 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Wed Sep 18 15:55:02 2019 +0200 Add tests for correct nudging and stacking commit d5c58da Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:37 2019 +0200 Delete packages from example commit 015b2e3 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:03:12 2019 +0200 Add validated svg for position_nudgestack commit 2484f71 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:50 2019 +0200 Update vdiffr version commit e2c1fb6 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 18:02:29 2019 +0200 Add test file with a doppelganger-test commit a681f59 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:49 2019 +0200 Add new examples commit 02f6be4 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:09:20 2019 +0200 Delete packages from @examples commit def4755 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 16:06:00 2019 +0200 Adjust filter criterion in examples commit c1729d1 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 17 15:39:56 2019 +0200 Add the zoo-package to Suggestions commit 5ebe5d4 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:01:48 2019 +0200 Add description of position_nudgestack commit 99b4b5e Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:01:13 2019 +0200 Add position_nudgestack into description commit 971b110 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 14:00:28 2019 +0200 Add position-nudgestack.R into man commit e5e91ea Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:58:38 2019 +0200 Add new position_nudgestack into NAMESPACE commit fedef93 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:56:35 2019 +0200 Add new position to DESCRIPTION commit bcc75a3 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Mon Sep 16 13:47:58 2019 +0200 Add time series example commit 23e3241 Author: Mara Alexeev <39673697+MaraAlexeev@users.noreply.github.com> 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 <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:26:32 2019 +0200 Delete emtpy rows commit a486906 Author: Thomas Knecht <thomasknecht@Thomass-MacBook-Pro-2.local> Date: Tue Sep 3 09:09:06 2019 +0200 Add position_nudgestack
1 parent dcb510e commit d5c4124

File tree

150 files changed

+6279
-534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+6279
-534
lines changed

‎DESCRIPTION

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ Suggests:
5555
sf (>= 0.7-3),
5656
svglite (>= 1.2.0.9001),
5757
testthat (>= 2.1.0),
58-
vdiffr (>= 0.3.0)
58+
vdiffr (>= 0.3.0),
59+
tsbox
5960
Enhances: sp
6061
License: GPL-2 | file LICENSE
6162
URL: http://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
@@ -153,11 +154,14 @@ Collate:
153154
'grob-dotstack.r'
154155
'grob-null.r'
155156
'grouping.r'
157+
'guide-bins.R'
156158
'guide-colorbar.r'
159+
'guide-colorsteps.R'
157160
'guide-legend.r'
158161
'guides-.r'
159162
'guides-axis.r'
160163
'guides-grid.r'
164+
'guides-none.r'
161165
'hexbin.R'
162166
'labeller.r'
163167
'labels.r'
@@ -179,12 +183,14 @@ Collate:
179183
'position-jitter.r'
180184
'position-jitterdodge.R'
181185
'position-nudge.R'
186+
'position-nudgestack.R'
182187
'position-stack.r'
183188
'quick-plot.r'
184189
'range.r'
185190
'save.r'
186191
'scale-.r'
187192
'scale-alpha.r'
193+
'scale-binned.R'
188194
'scale-brewer.r'
189195
'scale-colour.r'
190196
'scale-continuous.r'
@@ -199,6 +205,7 @@ Collate:
199205
'scale-manual.r'
200206
'scale-shape.r'
201207
'scale-size.r'
208+
'scale-steps.R'
202209
'scale-type.R'
203210
'scale-view.r'
204211
'scale-viridis.r'

‎NAMESPACE

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,30 @@ S3method(grobWidth,absoluteGrob)
6767
S3method(grobWidth,zeroGrob)
6868
S3method(grobX,absoluteGrob)
6969
S3method(grobY,absoluteGrob)
70+
S3method(guide_gengrob,axis)
71+
S3method(guide_gengrob,bins)
7072
S3method(guide_gengrob,colorbar)
73+
S3method(guide_gengrob,guide_none)
7174
S3method(guide_gengrob,legend)
75+
S3method(guide_geom,axis)
76+
S3method(guide_geom,bins)
7277
S3method(guide_geom,colorbar)
78+
S3method(guide_geom,guide_none)
7379
S3method(guide_geom,legend)
80+
S3method(guide_merge,axis)
81+
S3method(guide_merge,bins)
7482
S3method(guide_merge,colorbar)
83+
S3method(guide_merge,guide_none)
7584
S3method(guide_merge,legend)
85+
S3method(guide_train,axis)
86+
S3method(guide_train,bins)
7687
S3method(guide_train,colorbar)
88+
S3method(guide_train,colorsteps)
89+
S3method(guide_train,guide_none)
7790
S3method(guide_train,legend)
91+
S3method(guide_transform,axis)
92+
S3method(guide_transform,default)
93+
S3method(guide_transform,guide_none)
7894
S3method(heightDetails,titleGrob)
7995
S3method(heightDetails,zeroGrob)
8096
S3method(interleave,default)
@@ -188,8 +204,11 @@ export(PositionIdentity)
188204
export(PositionJitter)
189205
export(PositionJitterdodge)
190206
export(PositionNudge)
207+
export(PositionNudgeStack)
191208
export(PositionStack)
192209
export(Scale)
210+
export(ScaleBinned)
211+
export(ScaleBinnedPosition)
193212
export(ScaleContinuous)
194213
export(ScaleContinuousDate)
195214
export(ScaleContinuousDatetime)
@@ -298,6 +317,8 @@ export(facet_grid)
298317
export(facet_null)
299318
export(facet_wrap)
300319
export(find_panel)
320+
export(flip_data)
321+
export(flipped_names)
301322
export(fortify)
302323
export(geom_abline)
303324
export(geom_area)
@@ -358,14 +379,21 @@ export(ggproto)
358379
export(ggproto_parent)
359380
export(ggsave)
360381
export(ggtitle)
382+
export(guide_axis)
383+
export(guide_bins)
361384
export(guide_colorbar)
385+
export(guide_colorsteps)
362386
export(guide_colourbar)
387+
export(guide_coloursteps)
363388
export(guide_gengrob)
364389
export(guide_geom)
365390
export(guide_legend)
366391
export(guide_merge)
392+
export(guide_none)
367393
export(guide_train)
394+
export(guide_transform)
368395
export(guides)
396+
export(has_flipped_aes)
369397
export(is.Coord)
370398
export(is.facet)
371399
export(is.ggplot)
@@ -405,6 +433,7 @@ export(position_identity)
405433
export(position_jitter)
406434
export(position_jitterdodge)
407435
export(position_nudge)
436+
export(position_nudgestack)
408437
export(position_stack)
409438
export(qplot)
410439
export(quickplot)
@@ -424,12 +453,14 @@ export(scale_alpha_discrete)
424453
export(scale_alpha_identity)
425454
export(scale_alpha_manual)
426455
export(scale_alpha_ordinal)
456+
export(scale_color_binned)
427457
export(scale_color_brewer)
428458
export(scale_color_continuous)
429459
export(scale_color_date)
430460
export(scale_color_datetime)
431461
export(scale_color_discrete)
432462
export(scale_color_distiller)
463+
export(scale_color_fermenter)
433464
export(scale_color_gradient)
434465
export(scale_color_gradient2)
435466
export(scale_color_gradientn)
@@ -438,14 +469,19 @@ export(scale_color_hue)
438469
export(scale_color_identity)
439470
export(scale_color_manual)
440471
export(scale_color_ordinal)
472+
export(scale_color_steps)
473+
export(scale_color_steps2)
474+
export(scale_color_stepsn)
441475
export(scale_color_viridis_c)
442476
export(scale_color_viridis_d)
477+
export(scale_colour_binned)
443478
export(scale_colour_brewer)
444479
export(scale_colour_continuous)
445480
export(scale_colour_date)
446481
export(scale_colour_datetime)
447482
export(scale_colour_discrete)
448483
export(scale_colour_distiller)
484+
export(scale_colour_fermenter)
449485
export(scale_colour_gradient)
450486
export(scale_colour_gradient2)
451487
export(scale_colour_gradientn)
@@ -454,17 +490,23 @@ export(scale_colour_hue)
454490
export(scale_colour_identity)
455491
export(scale_colour_manual)
456492
export(scale_colour_ordinal)
493+
export(scale_colour_steps)
494+
export(scale_colour_steps2)
495+
export(scale_colour_stepsn)
496+
export(scale_colour_viridis_b)
457497
export(scale_colour_viridis_c)
458498
export(scale_colour_viridis_d)
459499
export(scale_continuous_identity)
460500
export(scale_discrete_identity)
461501
export(scale_discrete_manual)
502+
export(scale_fill_binned)
462503
export(scale_fill_brewer)
463504
export(scale_fill_continuous)
464505
export(scale_fill_date)
465506
export(scale_fill_datetime)
466507
export(scale_fill_discrete)
467508
export(scale_fill_distiller)
509+
export(scale_fill_fermenter)
468510
export(scale_fill_gradient)
469511
export(scale_fill_gradient2)
470512
export(scale_fill_gradientn)
@@ -473,22 +515,30 @@ export(scale_fill_hue)
473515
export(scale_fill_identity)
474516
export(scale_fill_manual)
475517
export(scale_fill_ordinal)
518+
export(scale_fill_steps)
519+
export(scale_fill_steps2)
520+
export(scale_fill_stepsn)
521+
export(scale_fill_viridis_b)
476522
export(scale_fill_viridis_c)
477523
export(scale_fill_viridis_d)
478524
export(scale_linetype)
525+
export(scale_linetype_binned)
479526
export(scale_linetype_continuous)
480527
export(scale_linetype_discrete)
481528
export(scale_linetype_identity)
482529
export(scale_linetype_manual)
483530
export(scale_radius)
484531
export(scale_shape)
532+
export(scale_shape_binned)
485533
export(scale_shape_continuous)
486534
export(scale_shape_discrete)
487535
export(scale_shape_identity)
488536
export(scale_shape_manual)
489537
export(scale_shape_ordinal)
490538
export(scale_size)
491539
export(scale_size_area)
540+
export(scale_size_binned)
541+
export(scale_size_binned_area)
492542
export(scale_size_continuous)
493543
export(scale_size_date)
494544
export(scale_size_datetime)
@@ -497,6 +547,7 @@ export(scale_size_identity)
497547
export(scale_size_manual)
498548
export(scale_size_ordinal)
499549
export(scale_type)
550+
export(scale_x_binned)
500551
export(scale_x_continuous)
501552
export(scale_x_date)
502553
export(scale_x_datetime)
@@ -505,6 +556,7 @@ export(scale_x_log10)
505556
export(scale_x_reverse)
506557
export(scale_x_sqrt)
507558
export(scale_x_time)
559+
export(scale_y_binned)
508560
export(scale_y_continuous)
509561
export(scale_y_date)
510562
export(scale_y_datetime)

‎NEWS.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# ggplot2 (development version)
22

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

‎R/axis-secondary.R

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
#' - A character vector giving labels (must be same length as `breaks`)
2121
#' - A function that takes the breaks as input and returns labels as output
2222
#'
23+
#' @param guide A position guide that will be used to render
24+
#' the axis on the plot. Usually this is [guide_axis()].
25+
#'
2326
#' @details
2427
#' `sec_axis` is used to create the specifications for a secondary axis.
2528
#' Except for the `trans` argument any of the arguments can be set to
@@ -79,7 +82,8 @@
7982
#' labels = scales::time_format("%b %d %I %p")))
8083
#'
8184
#' @export
82-
sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels = waiver()) {
85+
sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels = waiver(),
86+
guide = waiver()) {
8387
# sec_axis() historically accpeted two-sided formula, so be permissive.
8488
if (length(trans) > 2) trans <- trans[c(1,3)]
8589

@@ -88,14 +92,15 @@ sec_axis <- function(trans = NULL, name = waiver(), breaks = waiver(), labels =
8892
trans = trans,
8993
name = name,
9094
breaks = breaks,
91-
labels = labels
95+
labels = labels,
96+
guide = guide
9297
)
9398
}
9499
#' @rdname sec_axis
95100
#'
96101
#' @export
97-
dup_axis <- function(trans = ~., name = derive(), breaks = derive(), labels = derive()) {
98-
sec_axis(trans, name, breaks, labels)
102+
dup_axis <- function(trans = ~., name = derive(), breaks = derive(), labels = derive(), guide = derive()) {
103+
sec_axis(trans, name, breaks, labels, guide)
99104
}
100105

101106
is.sec_axis <- function(x) {
@@ -148,6 +153,7 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
148153
if (is.derived(self$breaks)) self$breaks <- scale$breaks
149154
if (is.waive(self$breaks)) self$breaks <- scale$trans$breaks
150155
if (is.derived(self$labels)) self$labels <- scale$labels
156+
if (is.derived(self$guide)) self$guide <- scale$guide
151157
},
152158

153159
transform_range = function(self, range) {

‎R/coord-.r

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Coord <- ggproto("Coord",
5959

6060
aspect = function(ranges) NULL,
6161

62-
labels = function(panel_params) panel_params,
62+
labels = function(labels, panel_params) labels,
6363

6464
render_fg = function(panel_params, theme) element_render(theme, "panel.border"),
6565

@@ -91,6 +91,14 @@ Coord <- ggproto("Coord",
9191
list()
9292
},
9393

94+
setup_panel_guides = function(self, panel_params, guides, params = list()) {
95+
panel_params
96+
},
97+
98+
train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) {
99+
panel_params
100+
},
101+
94102
transform = function(data, range) NULL,
95103

96104
distance = function(x, y, panel_params) NULL,

0 commit comments

Comments
 (0)