Process all sections

Only the first section was being processed. Any later sections were dropped silently. Fixes yihui#25.
joshuaulrich · Mar 15, 2024 · 964a8bb · 964a8bb
1 parent 89e828b
commit 964a8bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/R/rd2roxygen.R b/R/rd2roxygen.R
@@ -27,9 +27,13 @@ parse_file = function(path) {
   out$usage = reconstruct(untag(rd$usage))
   out$desc = gsub("$\n+|\n+^", "", reconstruct(untag(rd$description)))
   out$details = reconstruct(untag(rd$details))
-  out$section = paste(reconstruct(untag(rd$section[1])),
-                       reconstruct(untag(rd$section[-1])), sep = ': ')
-  if (length(out$section) == 0) out$section = NULL
+
+  # Process sections
+  out$section = lapply(rd[names(rd) == "section"], function(section) {
+    paste(reconstruct(untag(section[1])),
+          reconstruct(untag(section[-1])), sep = ': ')
+  })
+
   out$format = reconstruct(untag(rd$format))
   out$value = reconstruct(untag(rd$value))
   out$note = reconstruct(untag(rd$note))

diff --git a/R/utils.R b/R/utils.R
@@ -13,7 +13,8 @@ reconstruct = function(rd) {
   if (is.null(rd)) return()
 
   if (is.list(rd)) {
-    if (length(tag(rd)) && tag(rd) %in% c('\\item', '\\tabular', '\\eqn', '\\deqn', '\\link')) {
+    multi = c('\\section', '\\subsection', '\\item', '\\tabular', '\\eqn', '\\deqn', '\\link')
+    if (length(tag(rd)) && tag(rd) %in% multi) {
       if (tag(rd) == '\\link')
         return(paste('\\link', sprintf('[%s]', attr(rd, 'Rd_option')), '{', rd, '}', sep = ""))
       if (length(rd) == 2) {