Better system for numbering images

DESCRIPTION

@@ -21,6 +21,7 @@ Imports:
     memoise,
     purrr,
     pkgload,
+    R6,
     rematch,
     rlang,
     rmarkdown (>= 1.1.9007),

NAMESPACE

@@ -109,6 +109,7 @@ export(template_navbar)
 export(template_reference)
 import(rlang)
 importFrom(MASS,addterm)
+importFrom(R6,R6Class)
 importFrom(magrittr,"%>%")
 importFrom(memoise,memoise)
 importFrom(roxygen2,roxygenise)

R/rd-data.R

@@ -148,18 +148,20 @@ as_data.tag_examples <- function(x, path, ...,
     }
   }
 
-  # TODO Handle plots
+  id_generator <- UniqueId$new()
+
   html <- purrr:::pmap_chr(
-    list(code = code, run = run, id = seq_along(code)),
+    list(code = code, run = run),
     format_example_chunk,
     env = child_env(env),
     path = path,
-    topic = topic
+    topic = topic,
+    obj_id = id_generator$id
   )
   paste(html, collapse = "")
 }
 
-format_example_chunk <- function(code, run, path, topic = "unknown", id = 1, env = global_env()) {
+format_example_chunk <- function(code, run, path, topic = "unknown", obj_id, env = global_env()) {
   if (!run) {
     code <- gsub("^\n|^", "# NOT RUN {\n", code)
     code <- gsub("\n$|$", "\n# }\n", code)
@@ -175,10 +177,7 @@ format_example_chunk <- function(code, run, path, topic = "unknown", id = 1, env
 
   expr <- evaluate::evaluate(code, env, new_device = TRUE)
 
-  replay_html(
-    expr,
-    name_prefix = paste0(topic, "-", id, "-")
-  )
+  replay_html(expr, topic = topic, obj_id = obj_id)
 }
 
 #' @export
@@ -225,3 +224,18 @@ is_newline <- function(x, trim = FALSE) {
   }
   identical(text, "\n")
 }
+
+UniqueId <- R6Class("UniqueId", public = list(
+  env = new_environment(),
+
+  id = function(name) {
+    if (!env_has(self$env, name)) {
+      id <- 1
+    } else {
+      id <- env_get(self$env, name) + 1
+    }
+
+    env_bind(self$env, !! name := id)
+    id
+  }
+))

R/replay-html.r

@@ -52,7 +52,7 @@ replay_html.list <- function(x, ...) {
 
   pieces <- character(length(parts))
   for (i in seq_along(parts)) {
-    pieces[i] <- replay_html(parts[[i]], obj_id = i, ...)
+    pieces[i] <- replay_html(parts[[i]], ...)
   }
   paste0(pieces, collapse = "")
 }
@@ -103,8 +103,8 @@ replay_html.error <- function(x, ...) {
 }
 
 #' @export
-replay_html.recordedplot <- function(x, name_prefix, obj_id, ...) {
-  path <- paste0(name_prefix, obj_id, ".png")
+replay_html.recordedplot <- function(x, topic, obj_id, ...) {
+  path <- paste0(topic, "-", obj_id(topic), ".png")
 
   w <- 700
   h <- w / 1.618

R/util.r

@@ -1,5 +1,6 @@
 #' @importFrom magrittr %>%
 #' @importFrom roxygen2 roxygenise
+#' @importFrom R6 R6Class
 #' @import rlang
 NULL