...

.Rbuildignore

@@ -27,3 +27,5 @@ ubuntu_17_installation.sh
 ^tests/testthat/Rplots.pdf$
 ^\.covrignore$
 ^vignettes$
+man/figures/shiny_plot.jpg
+man/figures/shiny_view.jpg

examples/tm_logo.R

@@ -2,8 +2,8 @@ data(World)
 
 tm_shape(World) +
 	tm_polygons("HPI", fill.scale = tm_scale_intervals(values = "RdYlGn")) +
-	tm_logo(c("https://www.r-project.org/logo/Rlogo.png", 
-			  system.file("img/tmap.png", package="tmap"))) +
-	tm_logo("http://blog.kulikulifoods.com/wp-content/uploads/2014/10/logo.png", 
+	tm_logo(c("https://www.r-project.org/logo/Rlogo.png",
+			  system.file("help", "figures", "logo.png", package = "tmap"))) +
+	tm_logo("http://blog.kulikulifoods.com/wp-content/uploads/2014/10/logo.png",
 			height=5, position = c("left", "top")) +
 	tm_format("World")

vignettes/adv_groups.Rmd

@@ -14,33 +14,11 @@ knitr::opts_chunk$set(
   fig.width = 8,
   comment = "#>"
 )
-hook_output <- knitr::knit_hooks$get("output")
-knitr::knit_hooks$set(output = function(x, options) {
-   lines <- options$output.lines
-   if (is.null(lines)) {
-     return(hook_output(x, options))  # pass to default hook
-   }
-   x <- unlist(strsplit(x, "\n"))
-   more <- "..."
-   if (length(lines)==1) {        # first n lines
-     if (length(x) > lines) {
-       # truncate the output, but add ....
-       x <- c(head(x, lines), more)
-     }
-   } else {
-     x <- c(more, x[lines], more)
-   }
-   # paste these lines together
-   x <- paste(c(x, ""), collapse = "\n")
-   hook_output(x, options)
- })
-
 ```
 
 
 ```{r, echo = FALSE, message = FALSE}
 library(tmap)
-tmap_options(scale = 0.75)
 ```