Adapt to CRAN policies.

.gitignore

@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 .Ruserdata
+ggvenn.Rcheck/

NAMESPACE

@@ -8,13 +8,16 @@ importFrom(dplyr,"%>%")
 importFrom(dplyr,as_label)
 importFrom(dplyr,as_tibble)
 importFrom(dplyr,count)
+importFrom(dplyr,filter)
+importFrom(dplyr,inner_join)
 importFrom(dplyr,mutate)
 importFrom(dplyr,select_if)
 importFrom(dplyr,tibble)
 importFrom(dplyr,tribble)
 importFrom(ggplot2,aes)
 importFrom(ggplot2,coord_fixed)
 importFrom(ggplot2,geom_polygon)
+importFrom(ggplot2,geom_segment)
 importFrom(ggplot2,geom_text)
 importFrom(ggplot2,ggplot)
 importFrom(ggplot2,guides)
@@ -27,3 +30,4 @@ importFrom(grid,gpar)
 importFrom(grid,grobTree)
 importFrom(grid,polygonGrob)
 importFrom(grid,textGrob)
+importFrom(stats,na.omit)

R/geom_venn.R

@@ -9,6 +9,9 @@
 #' @param show_percentage Show percentage for each set.
 #' @param digits The desired number of digits after the decimal point
 #' @param label_sep separator character for displaying elements.
+#' @param count_column Specify column for element repeat count.
+#' @param show_outside Show outside elements (not belongs to any set).
+#' @param auto_scale Allow automatically resizing circles according to element counts.
 #' @param fill_color Filling colors in circles.
 #' @param fill_alpha Transparency for filling circles.
 #' @param stroke_color Stroke color for drawing circles.
@@ -90,6 +93,7 @@ geom_venn <- function(mapping = NULL, data = NULL,
                       set_name_size = 6,
                       text_color = "black",
                       text_size = 4) {
+  show_outside <- match.arg(show_outside)
   l <- layer(mapping = mapping, data = data,
              geom = GeomVenn, stat = stat, position = position,
              params = list(na.rm = TRUE, ...))

R/ggvenn.R

@@ -19,6 +19,7 @@
 #' @param label_sep Separator character for displaying elements.
 #' @param count_column Specify column for element repeat count.
 #' @param show_outside Show outside elements (not belongs to any set).
+#' @param auto_scale Allow automatically resizing circles according to element counts.
 #' @return The ggplot object to print or save to file.
 #' @examples
 #' library(ggvenn)
@@ -55,8 +56,9 @@
 #' ggvenn(a, show_elements = TRUE)
 #' ggvenn(d, show_elements = "value")
 #' @seealso geom_venn
-#' @importFrom dplyr tibble tribble as_tibble %>% select_if mutate count
-#' @importFrom ggplot2 ggplot aes geom_polygon geom_text scale_x_continuous scale_y_continuous scale_fill_manual guides coord_fixed theme_void layer
+#' @importFrom dplyr tibble tribble as_tibble %>% select_if mutate count filter inner_join
+#' @importFrom ggplot2 ggplot aes geom_polygon geom_segment geom_text scale_x_continuous scale_y_continuous scale_fill_manual guides coord_fixed theme_void layer
+#' @importFrom stats na.omit
 #' @export
 ggvenn <- function(data, columns = NULL,
                    show_elements = FALSE,
@@ -293,7 +295,7 @@ gen_seg_pos_2 <- function(scale_info) {
         df <- tibble(x = x_pos, y = 0, xend = x2_pos, yend = -1.2 * scale_info['a_radius'])
       } else if (scale_info['b_radius'] < min_overlap_for_text) {
         x2_pos <- x_dist - 1.2 * (scale_info['a_radius'] - scale_info['overlap_size']) / 2
-        df <- tibble(x = x_pos, y = 0, xend = x2_xpos, yend = -1.2 * scale_info['a_radius'])
+        df <- tibble(x = x_pos, y = 0, xend = x2_pos, yend = -1.2 * scale_info['a_radius'])
       } else {
         df <- tibble(x = x_pos, y = 0, xend = x_pos, yend = -1)
       }
@@ -377,7 +379,9 @@ gen_label_pos_4 <- function() {
 prepare_venn_data <- function(data, columns = NULL,
                               show_elements = FALSE, show_percentage = TRUE, digits = 1,
                               label_sep = ",", count_column = NULL,
-                              show_outside = "auto", auto_scale = FALSE) {
+                              show_outside = c("auto", "none", "always"),
+                              auto_scale = FALSE) {
+  show_outside <- match.arg(show_outside)
   if (is.data.frame(data)) {
     if (is.null(columns)) {
       columns = data %>% select_if(is.logical) %>% names
@@ -521,7 +525,7 @@ prepare_venn_data <- function(data, columns = NULL,
   } else {
     stop("`data` should be either a list or a data.frame")
   }
-  if ((show_outside == "none") || (show_outside == "auto" & df_text$n[[nrow(df_text)]] == 0)) {
+  if ((show_outside == "none") || (show_outside == "auto" && df_text$n[[nrow(df_text)]] == 0)) {
     if (df_text$n[[nrow(df_text)]] > 0)
       warning("Although not display in plot, outside elements are still count in percentages.")
     df_text <- df_text[-nrow(df_text), ]

R/globals.R

@@ -1,4 +1,14 @@
 utils::globalVariables(c("theta", "x_raw", "y_raw",
                          "A", "B", "C", "D", "group",
                          "head", "hjust", "n", "text",
-                         "vjust", "x", "y"))
+                         "vjust", "x", "y",
+                         "name", "xend", "yend",
+                         "gen_element_df_2", "gen_element_df_3", "gen_element_df_4",
+                         "gen_circle",
+                         "calc_scale_info_2", "calc_scale_info_3", "calc_scale_info_4",
+                         "min_overlap_for_text",
+                         "gen_circle_2", "gen_circle_3", "gen_circle_4",
+                         "gen_seg_pos_2", "gen_seg_pos_3", "gen_seg_pos_4",
+                         "gen_label_pos_2", "gen_label_pos_3", "gen_label_pos_4",
+                         "gen_text_pos_2", "gen_text_pos_3", "gen_text_pos_4",
+                         "prepare_venn_data"))