Merge branch 'master' of https://github.com/r-tmap/tmap

NAMESPACE

@@ -127,6 +127,7 @@ export(opt_tm_cartogram_ncont)
 export(opt_tm_dots)
 export(opt_tm_labels)
 export(opt_tm_lines)
+export(opt_tm_markers)
 export(opt_tm_polygons)
 export(opt_tm_raster)
 export(opt_tm_sf)

R/tm_layers_cartogram.R

@@ -1,5 +1,3 @@
-#' @param type,itermax,expansion,inplace,share Additional options
-#'
 #' @rdname tm_cartogram
 #' @name opt_tm_cartogram
 #' @param type cartogram type, one of: "cont" for contiguous cartogram, "ncont" for non-contiguous cartogram and "dorling" for Dorling cartograms

R/tm_layers_text.R

@@ -65,6 +65,7 @@ opt_tm_labels = function(points.only = "ifany",
 #' @param dots.grob.dim vector of four values that determine how grob objects (see details) are shown in view mode. The first and second value are the width and height of the displayed icon. The third and fourth value are the width and height of the rendered png image that is used for the icon. Generally, the third and fourth value should be large enough to render a ggplot2 graphic successfully. Only needed for the view mode.
 #' @rdname tm_text
 #' @name opt_tm_labels
+#' @export
 opt_tm_markers = function(markers.on.top.of.text = FALSE,
  points.only = "ifany",
  shadow = FALSE,