fix rstudio#825: appendix_name can be a function, too

yihui · yihui · commit 8d5f411de1a0 · 2019-11-21T16:22:10.000-06:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: bookdown
 Type: Package
 Title: Authoring Books and Technical Documents with R Markdown
-Version: 0.15.2
+Version: 0.15.3
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
     person("JJ", "Allaire", role = "ctb"),
diff --git a/R/html.R b/R/html.R
@@ -970,10 +970,22 @@ number_appendix = function(x, i1, i2, type = c('toc', 'header'), prefix, counter
     stop('appendix_counters in _bookdown.yml must be either a character vector or a function')
   }
 
+  prefix_fun = if (is.character(prefix)) {
+    function(i) switch(
+      length(prefix), paste0(prefix, i),
+      paste0(prefix[1], i, prefix[2]),
+      stop('appendix_name must be of length 1 or 2')
+    )
+  } else if (is.function(prefix)) prefix else {
+    stop('appendix_name in _bookdown.yml must be a character string or function')
+  }
+  counters = vapply(s, counter_fun, character(1))
+  prefixes = character(length(s))
   # only add the prefix to top-level appendix titles
-  if (length(prefix) == 1 && prefix != '') prefix = ifelse(top, prefix, '')
+  prefixes[top] = vapply(counters[top], prefix_fun, character(1))
+  counters[top] = ''
 
-  x[i] = paste0(s1, prefix, vapply(s, counter_fun, character(1)), s3)
+  x[i] = paste0(s1, prefixes, counters, s3)
   x
 }
 
diff --git a/tests/testit/test-utils.R b/tests/testit/test-utils.R
@@ -68,6 +68,14 @@ assert('number_appendix inserts the prefix and counters', {
       '<li><span class=\"toc-section-number\">APP b</span> Two',
       '</ul>'
     ))
+  (number_appendix(html, 2, 5, 'toc', prefix = c('APP ', ':'), counters = letters) %==%
+      c(
+        '<ul>',
+        '<li><span class=\"toc-section-number\">APP a:</span> One',
+        '<li><span class=\"toc-section-number\">a.1</span> One subsection',
+        '<li><span class=\"toc-section-number\">APP b:</span> Two',
+        '</ul>'
+      ))
   eng_ints <- function(n) {
     eng = c("one", "two", "three")[n[1]]
     rest = paste0(n[-1], collapse = ".")
